diff --git a/fdroid b/fdroid index 77e468cf..91f50644 100755 --- 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 39fffa29..5702ee7d 100644 --- 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 16086b42..38a990a1 100644 --- 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 afc403f5..ac5e5074 100644 --- 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 d6f8a504..0c33400c 100644 --- 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 1b72e603..c7878d51 100644 --- 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 6ed54fa2..74c185b1 100644 --- 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 8c326c29..34293ebb 100644 --- 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 f04dc264..83cbce82 100644 --- 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 e0692b5e..3211d4f2 100644 --- 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 2169f81c..4d244443 100644 --- 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 4c99f4ad..1ef05af5 100644 --- 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)