lint: optionally check format

[fdroidserver.git] / fdroid

diff --git a/fdroid b/fdroid
index 91dc992925d647bec40b9702ce2d4a774bfd4db3..ef3a001a011e90dbc650cf0b1a23e9ad6c5d6a14 100755 (executable)
--- a/fdroid
+++ b/fdroid
@@ -22,7 +22,8 @@ import sys
 import logging
 
 import fdroidserver.common
-from optparse import OptionError
+import fdroidserver.metadata
+from argparse import ArgumentError
 
 commands = {
     "build": "Build a package from source",
@@ -98,12 +99,15 @@ def main():
     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,13 +122,14 @@ 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:
             logging.critical(str(e))
         sys.exit(1)
-    except OptionError, e:
+    except ArgumentError as e:
         logging.critical(str(e))
         sys.exit(1)
     except KeyboardInterrupt: