makebuildserver: verify https all requests to avoid urllib3 warnings

[fdroidserver.git] / fdroid

diff --git a/fdroid b/fdroid
index 33a6025103cb8b86ef2b5e60221da8b4d2d9642c..bc1655b9786feacc99c3bcdfaf22b6f8693eb180 100755 (executable)
--- a/fdroid
+++ b/fdroid
@@ -1,9 +1,8 @@
-#!/usr/bin/env python2
-# -*- coding: utf-8 -*-
+#!/usr/bin/env python3
 #
 # fdroid.py - part of the FDroid server tools
 # Copyright (C) 2010-2015, Ciaran Gultnieks, ciaran@ciarang.com
-# Copyright (C) 2013-2014 Daniel Martí <mvdan@mvdan.cc>
+# Copyright (C) 2013-2014 Daniel Marti <mvdan@mvdan.cc>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -22,6 +21,7 @@ import sys
 import logging
 
 import fdroidserver.common
+import fdroidserver.metadata
 from argparse import ArgumentError
 
 commands = {
@@ -38,19 +38,21 @@ commands = {
     "rewritemeta": "Rewrite all the metadata files",
     "lint": "Warn about possible metadata errors",
     "scanner": "Scan the source code of a package",
+    "dscanner": "Dynamically scan APKs post build",
     "stats": "Update the stats of the repo",
     "server": "Interact with the repo HTTP server",
     "signindex": "Sign indexes created using update --nosign",
+    "btlog": "Update the binary transparency log for a URL",
 }
 
 
 def print_help():
-    print "usage: fdroid [-h|--help|--version] <command> [<args>]"
-    print
-    print "Valid commands are:"
+    print("usage: fdroid [-h|--help|--version] <command> [<args>]")
+    print("")
+    print("Valid commands are:")
     for cmd, summary in commands.items():
-        print "   " + cmd + ' ' * (15 - len(cmd)) + summary
-    print
+        print("   " + cmd + ' ' * (15 - len(cmd)) + summary)
+    print("")
 
 
 def main():
@@ -76,9 +78,11 @@ def main():
                     import subprocess
                     try:
                         output = subprocess.check_output(['git', 'describe'],
-                                                         stderr=subprocess.STDOUT)
+                                                         stderr=subprocess.STDOUT,
+                                                         universal_newlines=True)
                     except subprocess.CalledProcessError:
-                        output = 'git commit ' + subprocess.check_output(['git', 'rev-parse', 'HEAD'])
+                        output = 'git commit ' + subprocess.check_output(['git', 'rev-parse', 'HEAD'],
+                                                                         universal_newlines=True)
                 elif os.path.exists('setup.py'):
                     import re
                     m = re.search(r'''.*[\s,\(]+version\s*=\s*["']([0-9a-z.]+)["'].*''',
@@ -91,19 +95,22 @@ def main():
             print(output),
             sys.exit(0)
         else:
-            print "Command '%s' not recognised.\n" % command
+            print("Command '%s' not recognised.\n" % command)
             print_help()
             sys.exit(1)
 
     verbose = any(s in sys.argv for s in ['-v', '--verbose'])
     quiet = any(s in sys.argv for s in ['-q', '--quiet'])
 
+    # Helpful to differentiate warnings from errors even when on quiet
+    logformat = '%(levelname)s: %(message)s'
+    loglevel = logging.INFO
     if verbose:
-        logging.basicConfig(format='%(levelname)s: %(message)s', level=logging.DEBUG)
+        loglevel = logging.DEBUG
     elif quiet:
-        logging.basicConfig(format='%(message)s', level=logging.WARN)
-    else:
-        logging.basicConfig(format='%(message)s', level=logging.INFO)
+        loglevel = logging.WARN
+
+    logging.basicConfig(format=logformat, level=loglevel)
 
     if verbose and quiet:
         logging.critical("Specifying --verbose and --quiet and the same time is silly")
@@ -118,7 +125,8 @@ def main():
     try:
         mod.main()
     # These are ours, contain a proper message and are "expected"
-    except fdroidserver.common.FDroidException, e:
+    except (fdroidserver.common.FDroidException,
+            fdroidserver.metadata.MetaDataException) as e:
         if verbose:
             raise
         else:
@@ -132,10 +140,11 @@ def main():
         sys.exit(1)
     # These should only be unexpected crashes due to bugs in the code
     # str(e) often doesn't contain a reason, so just show the backtrace
-    except Exception, e:
+    except Exception as e:
         logging.critical("Unknown exception found!")
         raise
     sys.exit(0)
 
+
 if __name__ == "__main__":
     main()