[gnome-ostree] build: Quiet patch checkout

[Colin Walters <walters src gnome org>]

commit e22b4b5633e5c2cef56851032549c9e74cfb159c
Author: Colin Walters <walters verbum org>
Date:   Mon Aug 20 17:42:15 2012 -0400

    build: Quiet patch checkout
    
    Otherwise we kind of spam the build output.

 src/ostbuild/pyostbuild/subprocess_helpers.py |    5 +++-
 src/ostbuild/pyostbuild/vcs.py                |   30 ++++++++++++++++++------
 2 files changed, 26 insertions(+), 9 deletions(-)
---
diff --git a/src/ostbuild/pyostbuild/subprocess_helpers.py b/src/ostbuild/pyostbuild/subprocess_helpers.py
index 0ff2db6..b05e77e 100755
--- a/src/ostbuild/pyostbuild/subprocess_helpers.py
+++ b/src/ostbuild/pyostbuild/subprocess_helpers.py
@@ -107,7 +107,10 @@ def run_sync(args, cwd=None, env=None, fatal_on_error=True, keep_stdin=False,
     else:
         logfn = None
     if logfn is not None:
-        logfn("pid %d exited with code %d" % (proc.pid, returncode))
+        if not log_initiation:
+            logfn("Command %s exited with code %d" % (subprocess.list2cmdline(args), returncode))
+        else:
+            logfn("pid %d exited with code %d" % (proc.pid, returncode))
     return returncode
 
 def run_sync_monitor_log_file(args, logfile, cwd=None, env=None,
diff --git a/src/ostbuild/pyostbuild/vcs.py b/src/ostbuild/pyostbuild/vcs.py
index f762b79..664da02 100755
--- a/src/ostbuild/pyostbuild/vcs.py
+++ b/src/ostbuild/pyostbuild/vcs.py
@@ -44,7 +44,8 @@ def _fixup_submodule_references(mirrordir, cwd):
         run_sync(['git', 'config', 'submodule.%s.url' % (sub_name, ), 'file://' + mirrordir], cwd=cwd)
     return have_submodules
 
-def get_vcs_checkout(mirrordir, keytype, uri, dest, branch, overwrite=True):
+def get_vcs_checkout(mirrordir, keytype, uri, dest, branch, overwrite=True,
+                     quiet=False):
     module_mirror = get_mirrordir(mirrordir, keytype, uri)
     assert keytype == 'git'
     checkoutdir_parent=os.path.dirname(dest)
@@ -62,15 +63,27 @@ def get_vcs_checkout(mirrordir, keytype, uri, dest, branch, overwrite=True):
             tmp_dest = dest
     if not os.path.isdir(tmp_dest):
         run_sync(['git', 'clone', '-q', '--origin', 'localmirror',
-                  '--no-checkout', module_mirror, tmp_dest])
-        run_sync(['git', 'remote', 'add', 'upstream', uri], cwd=tmp_dest)
+                  '--no-checkout', module_mirror, tmp_dest],
+                 log_initiation=(not quiet),
+                 log_success=(not quiet))
+        run_sync(['git', 'remote', 'add', 'upstream', uri], cwd=tmp_dest,
+                 log_initiation=(not quiet),
+                 log_success=(not quiet))
     else:
-        run_sync(['git', 'fetch', 'localmirror'], cwd=tmp_dest)
-    run_sync(['git', 'checkout', '-q', branch], cwd=tmp_dest)
-    run_sync(['git', 'submodule', 'init'], cwd=tmp_dest)
+        run_sync(['git', 'fetch', 'localmirror'], cwd=tmp_dest,
+                 log_initiation=(not quiet),
+                 log_success=(not quiet))
+    run_sync(['git', 'checkout', '-q', branch], cwd=tmp_dest,
+             log_initiation=(not quiet),
+             log_success=(not quiet))
+    run_sync(['git', 'submodule', 'init'], cwd=tmp_dest,
+             log_initiation=(not quiet),
+             log_success=(not quiet))
     have_submodules = _fixup_submodule_references(mirrordir, tmp_dest)
     if have_submodules:
-        run_sync(['git', 'submodule', 'update'], cwd=tmp_dest)
+        run_sync(['git', 'submodule', 'update'], cwd=tmp_dest,
+                 log_initiation=(not quiet),
+                 log_success=(not quiet))
     if tmp_dest != dest:
         os.rename(tmp_dest, dest)
     return dest
@@ -175,7 +188,8 @@ def checkout_patches(mirrordir, patchdir, component, patches_path=None):
         patches_mirror = get_mirrordir(mirrordir, patches_keytype, patches_uri)
         get_vcs_checkout(mirrordir, patches_keytype, patches_uri,
                          patchdir, patches['revision'],
-                         overwrite=True)
+                         overwrite=True,
+                         quiet=True)
 
     return patchdir