chiark
/
gitweb
/
~ianmdlvl
/
fdroidserver.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5bf5ba0
)
Use logging with proper format when warning about improper verbose/quiet usage
author
Daniel Martí
<mvdan@mvdan.cc>
Sat, 5 Jul 2014 12:17:02 +0000
(14:17 +0200)
committer
Daniel Martí
<mvdan@mvdan.cc>
Sat, 5 Jul 2014 12:17:02 +0000
(14:17 +0200)
fdroid
patch
|
blob
|
history
diff --git
a/fdroid
b/fdroid
index 999b667505fc86a616f4b0f47a0ac6796bc4bf2f..c59578cf3b62f1e3da85810e941e8bd8701e08e3 100755
(executable)
--- a/
fdroid
+++ b/
fdroid
@@
-69,9
+69,6
@@
def main():
verbose = any(s in sys.argv for s in ['-v', '--verbose'])
quiet = any(s in sys.argv for s in ['-q', '--quiet'])
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)
if verbose:
logging.basicConfig(format='%(levelname)s: %(message)s', level=logging.DEBUG)
@@
-80,6
+77,10
@@
def main():
else:
logging.basicConfig(format='%(message)s', level=logging.INFO)
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
# Trick optparse into displaying the right usage when --help is used.
sys.argv[0] += ' ' + command