Don't output stdout/stderr twice, print what is run and where

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index 4364f73ddda15ec3837f11dc485127a6c136c726..b1c1c4002e8f7519cfdc9129e15b535c59257a52 100644 (file)
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -894,8 +894,9 @@ def main():
     for app in build_succeeded:
         print "success: %s" % (app['id'])
 
-    for fa in failed_apps:
-        print "Build for app %s failed:\n%s" % (fa, failed_apps[fa])
+    if not options.verbose:
+        for fa in failed_apps:
+            print "Build for app %s failed:\n%s" % (fa, failed_apps[fa])
 
     print "Finished."
     if len(build_succeeded) > 0:

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index b6ced657519e1d9396e7c29ebc050770f28dcd3f..88f4ec26a69d593d92eb5ad57a3932c9cf7700a1 100644 (file)
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -1815,6 +1815,9 @@ def FDroidPopen(commands, cwd,
                 sys.stderr.flush()
             result.stderr += line
 
+    if verbose:
+        print "Directory: %s" % cwd
+        print " > %s" % ' '.join(commands)
     p.communicate()
     result.returncode = p.returncode
     return result