Add logging to verify

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index ca3c1504a2622c21fa8b35731bc1627a842b8ac1..b335e0f5e09c76cee9713d678840526d8029eca9 100644 (file)
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -665,7 +665,7 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
 
     p = FDroidPopen([os.path.join(config['sdk_path'],
                         'build-tools', config['build_tools'], 'aapt'),
-                        'dump', 'badging', src])
+                        'dump', 'badging', src], ouptut=False)
 
     vercode = None
     version = None

diff --git a/fdroidserver/verify.py b/fdroidserver/verify.py
index ea880cf61744dfe500bafe210ac992898ccf65e0..0192f7132719dc17fbc141e4b975fa03141b57d2 100644 (file)
--- a/fdroidserver/verify.py
+++ b/fdroidserver/verify.py
@@ -23,10 +23,10 @@ import shutil
 import subprocess
 import glob
 from optparse import OptionParser
-
-from common import FDroidPopen
+import logging
 
 import common
+from common import FDroidPopen
 
 options = None
 config = None
@@ -45,12 +45,12 @@ def main():
 
     tmp_dir = 'tmp'
     if not os.path.isdir(tmp_dir):
-        print "Creating temporary directory"
+        logging.info("Creating temporary directory")
         os.makedirs(tmp_dir)
 
     unsigned_dir = 'unsigned'
     if not os.path.isdir(unsigned_dir):
-        print "No unsigned directory - nothing to do"
+        logging.error("No unsigned directory - nothing to do")
         sys.exit(0)
 
     verified = 0
@@ -70,13 +70,13 @@ def main():
 
         try:
 
-            print "Processing " + apkfilename
+            logging.info("Processing " + apkfilename)
 
             remoteapk = os.path.join(tmp_dir, apkfilename)
             if os.path.exists(remoteapk):
                 os.remove(remoteapk)
             url = 'https://f-droid.org/repo/' + apkfilename
-            print "...retrieving " + url
+            logging.info("...retrieving " + url)
             p = FDroidPopen(['wget', url], cwd=tmp_dir)
             if p.returncode != 0:
                 raise Exception("Failed to get " + apkfilename)
@@ -101,14 +101,14 @@ def main():
             if len(lines) != 1 or 'META-INF' not in lines[0]:
                 raise Exception("Unexpected diff output - " + p.stdout)
 
-            print "...successfully verified"
+            logging.info("...successfully verified")
             verified += 1
 
         except Exception, e:
-            print "...NOT verified - {0}".format(e)
+            logging.info("...NOT verified - {0}".format(e))
             notverified += 1
 
-    print "\nFinished"
+    logging.info("Finished")
     print "{0} successfully verified".format(verified)
     print "{0} NOT verified".format(notverified)