From: Daniel Martí <mvdan@mvdan.cc>
Date: Sat, 5 Jul 2014 12:17:02 +0000 (+0200)
Subject: Use logging with proper format when warning about improper verbose/quiet usage
X-Git-Tag: 0.2.1~34
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=4814238baf546fb630c23ffc7eceaf8ed362c22d;p=fdroidserver.git

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

diff --git a/fdroid b/fdroid
index 999b6675..c59578cf 100755
--- 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'])
-    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)
@@ -80,6 +77,10 @@ def main():
     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