[gnome-ostree] build: Delete qa-pull-deploy builtin, just use LibQA directly in builddisks

[Colin Walters <walters src gnome org>]

commit f3818fbeb676684fded6f1be42702a6aaeb59e26
Author: Colin Walters <walters verbum org>
Date:   Tue Feb 26 17:56:20 2013 -0500

    build: Delete qa-pull-deploy builtin, just use LibQA directly in builddisks
    
    Just cleaner.

 Makefile-ostbuild.am              |    1 -
 src/js/builtins/qa_pull_deploy.js |   67 -------------------------------------
 src/js/main.js                    |    1 -
 src/js/tasks/task-builddisks.js   |   15 +++++++--
 4 files changed, 12 insertions(+), 72 deletions(-)
---
diff --git a/Makefile-ostbuild.am b/Makefile-ostbuild.am
index 51a613f..033413c 100644
--- a/Makefile-ostbuild.am
+++ b/Makefile-ostbuild.am
@@ -64,7 +64,6 @@ jsostbuiltins_DATA= \
        src/js/builtins/git_mirror.js \
        src/js/builtins/make.js \
        src/js/builtins/qa_make_disk.js \
-       src/js/builtins/qa_pull_deploy.js \
        src/js/builtins/run_task.js \
        src/js/builtins/shell.js \
        $(NULL)
diff --git a/src/js/main.js b/src/js/main.js
index 19035e5..e089d32 100755
--- a/src/js/main.js
+++ b/src/js/main.js
@@ -24,7 +24,6 @@ const BUILTINS = ['autobuilder',
                   'git-mirror',
                   'make',
                   'qa-make-disk',
-                 'qa-pull-deploy',
                   'run-task',
                   'shell'];
 
diff --git a/src/js/tasks/task-builddisks.js b/src/js/tasks/task-builddisks.js
index 661907a..950a901 100644
--- a/src/js/tasks/task-builddisks.js
+++ b/src/js/tasks/task-builddisks.js
@@ -85,9 +85,18 @@ const TaskBuildDisks = new Lang.Class({
             } else {
                 LibQA.createDisk(diskPath, cancellable);
             }
-                 ProcUtil.runSync(['ostbuild', 'qa-pull-deploy', diskPath.get_path(), 
-                                               this.repo.get_path(), osname, targetName, targetRevision],
-                                              cancellable, { logInitiation: true });
+            let mntdir = subworkdir.get_child('mnt-' + osname + '-' + squashedName);
+            GSystem.file_ensure_directory(mntdir, true, cancellable);
+            let gfmnt = new GuestFish.GuestMount(diskPath, { partitionOpts: LibQA.DEFAULT_GF_PARTITION_OPTS,
+                                                             readWrite: true });
+            gfmnt.mount(mntdir, cancellable);
+            try {
+                LibQA.pullDeploy(mntdir, this.repo, osname, targetName, targetRevision,
+                                 cancellable);
+            } finally {
+                gfmnt.umount(cancellable);
+            }
+            LibQA.grubInstall(diskPath, cancellable);
              }
 
         GSystem.file_rename(workImageDir, targetImageDir, cancellable);