use jarsigner and keytool from same JDK as is being set in JAVA7_HOME

[fdroidserver.git] / fdroid

diff --git a/fdroid b/fdroid
index f4d23cbfb337f911205cb223be352eb56d0a026d..e24c0081ed8b464c573a13f385ca5e2aee0448e6 100755 (executable)
--- a/fdroid
+++ b/fdroid
@@ -3,7 +3,7 @@
 #
 # 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
@@ -51,7 +51,7 @@ def print_help():
     print("Valid commands are:")
     for cmd, summary in commands.items():
         print("   " + cmd + ' ' * (15 - len(cmd)) + summary)
-    print()
+    print("")
 
 
 def main():
@@ -137,7 +137,7 @@ 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)