From cb3a08ff4bc502b1d1dda8db30bc6cbbaa832f13 Mon Sep 17 00:00:00 2001
From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Sat, 15 Feb 2014 23:27:19 +0000
Subject: [PATCH] Improve build output situation since logging changes

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

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index 76c3a752..c83fb0ce 100644
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -907,19 +907,19 @@ def main():
                 logfile = open(os.path.join(log_dir, app['id'] + '.log'), 'a+')
                 logfile.write(str(be))
                 logfile.close()
-                logging.info("Could not build app %s due to BuildException: %s" % (app['id'], be))
+                print("Could not build app %s due to BuildException: %s" % (app['id'], be))
                 if options.stop:
                     sys.exit(1)
                 failed_apps[app['id']] = be
                 wikilog = be.get_wikitext()
             except VCSException as vcse:
-                logging.info("VCS error while building app %s: %s" % (app['id'], vcse))
+                print("VCS error while building app %s: %s" % (app['id'], vcse))
                 if options.stop:
                     sys.exit(1)
                 failed_apps[app['id']] = vcse
                 wikilog = str(vcse)
             except Exception as e:
-                logging.info("Could not build app %s due to unknown error: %s" % (app['id'], traceback.format_exc()))
+                print("Could not build app %s due to unknown error: %s" % (app['id'], traceback.format_exc()))
                 if options.stop:
                     sys.exit(1)
                 failed_apps[app['id']] = e
diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index b10e2e2f..e8a2b717 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -1073,11 +1073,13 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver=
         for d in update_dirs:
             subdir = os.path.join(root_dir, d)
             if d == '.':
-                logging.info("Updating main project")
+                print("Updating main project")
                 cmd = parms + ['-p', d]
             else:
-                logging.info("Updating subproject %s" % d)
+                print("Updating subproject %s" % d)
                 cmd = lparms + ['-p', d]
+            print cmd
+            print ' '.join(cmd)
             p = FDroidPopen(cmd, cwd=root_dir)
             # Check to see whether an error was returned without a proper exit
             # code (this is the case for the 'no target set or target invalid'
@@ -1339,6 +1341,10 @@ def FDroidPopen(commands, cwd=None, output=True):
             logging.info("Directory: %s" % cwd)
         logging.info("> %s" % ' '.join(commands))
 
+    if cwd:
+        print("Directory: %s" % cwd)
+    print("> %s" % ' '.join(commands))
+
     result = PopenResult()
     p = subprocess.Popen(commands, cwd=cwd,
             stdout=subprocess.PIPE, stderr=subprocess.STDOUT,