All logging goes to stderr, FDroidPopen should too

[fdroidserver.git] / fdroid

diff --git a/fdroid b/fdroid
index c597eaead50e9f98fe4bdfe9991ee1015ee51d71..288977b69dd29519796efbbb7af00e61a474560c 100755 (executable)
--- a/fdroid
+++ b/fdroid
@@ -21,10 +21,13 @@
 import sys
 import logging
 
+from fdroidserver.common import FDroidException
+
 commands = {
     "build": "Build a package from source",
     "init": "Quickly start a new repository",
     "publish": "Sign and place packages in the repo",
+    "gpgsign": "Add gpg signatures for packages in repo",
     "update": "Update repo information for new packages",
     "verify": "Verify the integrity of downloaded packages",
     "checkupdates": "Check for updates to applications",
@@ -82,7 +85,24 @@ def main():
 
     del sys.argv[1]
     mod = __import__('fdroidserver.' + command, None, None, [command])
-    mod.main()
+
+    try:
+        mod.main()
+    # These are ours, contain a proper message and are "expected"
+    except FDroidException, e:
+        if verbose:
+            raise
+        else:
+            logging.critical(str(e))
+        sys.exit(1)
+    except KeyboardInterrupt:
+        print('')
+        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:
+        logging.critical("Unknown exception found!")
+        raise
     sys.exit(0)
 
 if __name__ == "__main__":