Merge branch 'revert-af707cd1' into 'master'

[fdroidserver.git] / fdroid

diff --git a/fdroid b/fdroid
index 045f2aacf8e5f133c61fff43c126d7bcb1add75b..bc1655b9786feacc99c3bcdfaf22b6f8693eb180 100755 (executable)
--- a/fdroid
+++ b/fdroid
@@ -38,9 +38,11 @@ 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",
 }
 
 
@@ -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.]+)["'].*''',
@@ -141,5 +145,6 @@ def main():
         raise
     sys.exit(0)
 
+
 if __name__ == "__main__":
     main()