Add --quiet option, restricting output to warnings/errors

diff --git a/fdroid b/fdroid
index 77e468cfeb73e6272cb2ba8bb3e7d5ca2cc2fd89..91f506440fc5ee6e5c69e63eb9a084617bd43f92 100755 (executable)
--- a/fdroid
+++ b/fdroid
@@ -63,9 +63,15 @@ def main():
             sys.exit(1)
 
     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)
     else:
         logging.basicConfig(format='%(message)s', level=logging.INFO)
 

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index 39fffa2913f0b6a435fef807c8931ff4921dc21c..5702ee7d686b813518535e510cc69b4d9a9a674c 100644 (file)
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -776,6 +776,8 @@ def parse_commandline():
     parser = OptionParser(usage="Usage: %prog [options] [APPID[:VERCODE] [APPID[:VERCODE] ...]]")
     parser.add_option("-v", "--verbose", action="store_true", default=False,
                       help="Spew out even more information than normal")
+    parser.add_option("-q", "--quiet", action="store_true", default=False,
+                      help="Restrict output to warnings and errors")
     parser.add_option("-l", "--latest", action="store_true", default=False,
                       help="Build only the latest version of each package")
     parser.add_option("-s", "--stop", action="store_true", default=False,

diff --git a/fdroidserver/checkupdates.py b/fdroidserver/checkupdates.py
index 16086b42d3a7eb1e2be71864e666fa8714b0b5c1..38a990a19330245ac614001d14a396034bee0e6b 100644 (file)
--- a/fdroidserver/checkupdates.py
+++ b/fdroidserver/checkupdates.py
@@ -293,6 +293,8 @@ def main():
     parser = OptionParser(usage="Usage: %prog [options] [APPID [APPID ...]]")
     parser.add_option("-v", "--verbose", action="store_true", default=False,
                       help="Spew out even more information than normal")
+    parser.add_option("-q", "--quiet", action="store_true", default=False,
+                      help="Restrict output to warnings and errors")
     parser.add_option("--auto", action="store_true", default=False,
                       help="Process auto-updates")
     parser.add_option("--autoonly", action="store_true", default=False,

diff --git a/fdroidserver/import.py b/fdroidserver/import.py
index afc403f53ba28ead4493fa8481f0997f3ffad7bc..ac5e5074f4ce569369bebaa7d87e88243d9779e5 100644 (file)
--- a/fdroidserver/import.py
+++ b/fdroidserver/import.py
@@ -96,6 +96,8 @@ def main():
     parser = OptionParser()
     parser.add_option("-v", "--verbose", action="store_true", default=False,
                       help="Spew out even more information than normal")
+    parser.add_option("-q", "--quiet", action="store_true", default=False,
+                      help="Restrict output to warnings and errors")
     parser.add_option("-u", "--url", default=None,
                       help="Project URL to import from.")
     parser.add_option("-s", "--subdir", default=None,

diff --git a/fdroidserver/init.py b/fdroidserver/init.py
index d6f8a5049adb1a9037d2235aaed983208daee1c6..0c33400cbfea4715a76a0a214527ac43d2fe2f9b 100644 (file)
--- a/fdroidserver/init.py
+++ b/fdroidserver/init.py
@@ -80,6 +80,8 @@ def main():
     parser = OptionParser()
     parser.add_option("-v", "--verbose", action="store_true", default=False,
                       help="Spew out even more information than normal")
+    parser.add_option("-q", "--quiet", action="store_true", default=False,
+                      help="Restrict output to warnings and errors")
     parser.add_option("-d", "--distinguished-name", default=None,
                       help="X.509 'Distiguished Name' used when generating keys")
     parser.add_option("--keystore", default=None,

diff --git a/fdroidserver/publish.py b/fdroidserver/publish.py
index 1b72e6037919ac93e2f6010d2fdeb78a32c34e6a..c7878d514f45ea2210c23981ccb6cc8bf1b509b4 100644 (file)
--- a/fdroidserver/publish.py
+++ b/fdroidserver/publish.py
@@ -40,6 +40,8 @@ def main():
     parser = OptionParser(usage="Usage: %prog [options] [APPID[:VERCODE] [APPID[:VERCODE] ...]]")
     parser.add_option("-v", "--verbose", action="store_true", default=False,
                       help="Spew out even more information than normal")
+    parser.add_option("-q", "--quiet", action="store_true", default=False,
+                      help="Restrict output to warnings and errors")
     (options, args) = parser.parse_args()
 
     config = common.read_config(options)

diff --git a/fdroidserver/rewritemeta.py b/fdroidserver/rewritemeta.py
index 6ed54fa2ae03b1085660e035e088fc8d35d3dac1..74c185b10266ed5cc2e2573aff1ffe11b2034175 100644 (file)
--- a/fdroidserver/rewritemeta.py
+++ b/fdroidserver/rewritemeta.py
@@ -33,6 +33,8 @@ def main():
     parser = OptionParser(usage="Usage: %prog [options] [APPID [APPID ...]]")
     parser.add_option("-v", "--verbose", action="store_true", default=False,
                       help="Spew out even more information than normal")
+    parser.add_option("-q", "--quiet", action="store_true", default=False,
+                      help="Restrict output to warnings and errors")
     (options, args) = parser.parse_args()
 
     config = common.read_config(options)

diff --git a/fdroidserver/scanner.py b/fdroidserver/scanner.py
index 8c326c294afe5684def9d5b729b328695485290a..34293ebb96f1ee82c1bfbb6cf3cb6fddea33568d 100644 (file)
--- a/fdroidserver/scanner.py
+++ b/fdroidserver/scanner.py
@@ -37,6 +37,8 @@ def main():
     parser = OptionParser(usage="Usage: %prog [options] [APPID[:VERCODE] [APPID[:VERCODE] ...]]")
     parser.add_option("-v", "--verbose", action="store_true", default=False,
                       help="Spew out even more information than normal")
+    parser.add_option("-q", "--quiet", action="store_true", default=False,
+                      help="Restrict output to warnings and errors")
     parser.add_option("--nosvn", action="store_true", default=False,
                       help="Skip svn repositories - for test purposes, because they are too slow.")
     (options, args) = parser.parse_args()

diff --git a/fdroidserver/server.py b/fdroidserver/server.py
index f04dc264d182229ea7e7fad30f66eca9c6ffef7d..83cbce8246b9f79e94488efedcd1dbe8503d1711 100644 (file)
--- a/fdroidserver/server.py
+++ b/fdroidserver/server.py
@@ -36,6 +36,8 @@ def main():
     parser = OptionParser()
     parser.add_option("-v", "--verbose", action="store_true", default=False,
                       help="Spew out even more information than normal")
+    parser.add_option("-q", "--quiet", action="store_true", default=False,
+                      help="Restrict output to warnings and errors")
     (options, args) = parser.parse_args()
 
     config = common.read_config(options)

diff --git a/fdroidserver/stats.py b/fdroidserver/stats.py
index e0692b5ebb6bb643ddebd94488f992e7c067b1aa..3211d4f20d08111029b49dbdba5d4223db7ed329 100644 (file)
--- a/fdroidserver/stats.py
+++ b/fdroidserver/stats.py
@@ -49,6 +49,8 @@ def main():
     parser = OptionParser()
     parser.add_option("-v", "--verbose", action="store_true", default=False,
                       help="Spew out even more information than normal")
+    parser.add_option("-q", "--quiet", action="store_true", default=False,
+                      help="Restrict output to warnings and errors")
     parser.add_option("-d", "--download", action="store_true", default=False,
                       help="Download logs we don't have")
     parser.add_option("--nologs", action="store_true", default=False,

diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index 2169f81cf2b4dfe887cd4416ea99e52dc82a82a0..4d2444436aab3d3a315f91fbf708a970c84fbaac 100644 (file)
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -357,8 +357,7 @@ def scan_apks(apps, apkcache, repodir, knownapks):
 
         else:
 
-            if not options.quiet:
-                logging.info("Processing " + apkfilename)
+            logging.info("Processing " + apkfilename)
             thisinfo = {}
             thisinfo['apkname'] = apkfilename
             srcfilename = apkfilename[:-4] + "_src.tar.gz"
@@ -786,9 +785,8 @@ def make_index(apps, apks, repodir, archive, categories):
 
     if config['repo_keyalias'] is not None:
 
-        if not options.quiet:
-            logging.info("Creating signed index.")
-            logging.info("Key fingerprint: %s" % repo_pubkey_fingerprint)
+        logging.info("Creating signed index.")
+        logging.info("Key fingerprint: %s" % repo_pubkey_fingerprint)
 
         #Create a jar of the index...
         p = FDroidPopen(['jar', 'cf', 'index.jar', 'index.xml'], cwd=repodir)
@@ -864,7 +862,7 @@ def main():
     parser.add_option("-v", "--verbose", action="store_true", default=False,
                       help="Spew out even more information than normal")
     parser.add_option("-q", "--quiet", action="store_true", default=False,
-                      help="No output, except for warnings and errors")
+                      help="Restrict output to warnings and errors")
     parser.add_option("-b", "--buildreport", action="store_true", default=False,
                       help="Report on build data status")
     parser.add_option("-i", "--interactive", default=False, action="store_true",

diff --git a/fdroidserver/verify.py b/fdroidserver/verify.py
index 4c99f4ad8149188e17f426d24de99cca256b186c..1ef05af5ff756d3045d072be19803d7abf169943 100644 (file)
--- a/fdroidserver/verify.py
+++ b/fdroidserver/verify.py
@@ -39,6 +39,8 @@ def main():
     parser = OptionParser(usage="Usage: %prog [options] [APPID[:VERCODE] [APPID[:VERCODE] ...]]")
     parser.add_option("-v", "--verbose", action="store_true", default=False,
                       help="Spew out even more information than normal")
+    parser.add_option("-q", "--quiet", action="store_true", default=False,
+                      help="Restrict output to warnings and errors")
     (options, args) = parser.parse_args()
 
     config = common.read_config(options)