mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-13 14:32:28 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use logging with proper format when warning about improper verbose/quiet usage

Browse source
This commit is contained in:
Daniel Martí 2014-07-05 14:17:02 +02:00
parent 5bf5ba04a6
commit 4814238baf
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
fdroid
View file

@ -69,9 +69,6 @@ def main():
verbose = any(s in sys.argv for s in ['-v', '--verbose']) verbose = any(s in sys.argv for s in ['-v', '--verbose'])
quiet = any(s in sys.argv for s in ['-q', '--quiet']) 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: if verbose:
logging.basicConfig(format='%(levelname)s: %(message)s', level=logging.DEBUG) logging.basicConfig(format='%(levelname)s: %(message)s', level=logging.DEBUG)
@ -80,6 +77,10 @@ def main():
else: else:
logging.basicConfig(format='%(message)s', level=logging.INFO) 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. # Trick optparse into displaying the right usage when --help is used.
sys.argv[0] += ' ' + command sys.argv[0] += ' ' + command