[gnome-ostree] autobuilder: In --autoupdate-self mode, pull before resolve, not after

[Colin Walters <walters src gnome org>]

commit 2cd3fe9b598a56aaa9002fa89694b5d77ca6ed25
Author: Colin Walters <walters verbum org>
Date:   Thu Nov 15 08:25:07 2012 -0500

    autobuilder: In --autoupdate-self mode, pull before resolve, not after
    
    This way we get changes more or less immediately.

 src/ostbuild/pyostbuild/builtin_autobuilder.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/src/ostbuild/pyostbuild/builtin_autobuilder.py b/src/ostbuild/pyostbuild/builtin_autobuilder.py
index c9ccd90..761b02a 100755
--- a/src/ostbuild/pyostbuild/builtin_autobuilder.py
+++ b/src/ostbuild/pyostbuild/builtin_autobuilder.py
@@ -88,8 +88,6 @@ class OstbuildAutobuilder(builtins.Builtin):
         changed = self.prev_source_snapshot_path != self.source_snapshot_path
         if changed:
             log("New version is %s" % (self.source_snapshot_path, ))
-            if self._autoupdate_self:
-                run_sync(['git', 'pull', '-r'])
         if self._resolve_is_full:
             log("scheduling next full resolve for %d seconds " % (self.resolve_poll_secs, ))
             self._resolve_timeout = self.loop.timeout_add(self.resolve_poll_secs*1000, self._fetch)
@@ -116,6 +114,8 @@ class OstbuildAutobuilder(builtins.Builtin):
             args.append('--fetch')
             args.append('--fetch-keep-going')
             args.extend(components)
+            if self._autoupdate_self:
+                run_sync(['git', 'pull', '-r'])
         self._resolve_is_full = len(components) == 0
         self.resolve_proc = subprocess.Popen(args, stdin=open('/dev/null'), stdout=f, stderr=f)
         log("started resolve: pid %d workdir: %s" % (self.resolve_proc.pid, workdir))