More log level fixes

[fdroidserver.git] / fdroid

diff --git a/fdroid b/fdroid
index 93a835794db69338afc74573c6c228021f83cfbc..c59578cf3b62f1e3da85810e941e8bd8701e08e3 100755 (executable)
--- a/fdroid
+++ b/fdroid
@@ -69,17 +69,18 @@ def main():
 
     verbose = any(s in sys.argv for s in ['-v', '--verbose'])
     quiet = any(s in sys.argv for s in ['-q', '--quiet'])
-    if verbose and quiet:
-        print "Specifying verbose and quiet and the same time is silly"
-        sys.exit(1)
 
     if verbose:
         logging.basicConfig(format='%(levelname)s: %(message)s', level=logging.DEBUG)
     elif quiet:
-        logging.basicConfig(format='%(levelname)s: %(message)s', level=logging.WARN)
+        logging.basicConfig(format='%(message)s', level=logging.WARN)
     else:
         logging.basicConfig(format='%(message)s', level=logging.INFO)
 
+    if verbose and quiet:
+        logging.critical("Specifying --verbose and --quiet and the same time is silly")
+        sys.exit(1)
+
     # Trick optparse into displaying the right usage when --help is used.
     sys.argv[0] += ' ' + command
 
@@ -95,6 +96,9 @@ def main():
         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: