From 83183a31ac035f98c0366975214e923cc44f9cc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Wed, 23 Oct 2013 19:53:33 +0200
Subject: [PATCH] Don't output stdout/stderr twice, print what is run and where

---
 fdroidserver/build.py  | 5 +++--
 fdroidserver/common.py | 3 +++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index 4364f73d..b1c1c400 100644
--- 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 b6ced657..88f4ec26 100644
--- 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