commands: Fix verbose mode

argparse and optparse differs in how action='count', default=1 is interpreted.
This commit is contained in:
Stein Magnus Jodal 2013-05-04 15:55:24 +02:00
parent 1c1b8f843e
commit f7234a6128
2 changed files with 4 additions and 4 deletions

View File

@ -27,11 +27,11 @@ parser.add_argument(
version='Mopidy %s' % versioning.get_version())
parser.add_argument(
'-q', '--quiet',
action='store_const', const=0, dest='verbosity_level',
action='store_const', const=-1, dest='verbosity_level',
help='less output (warning level)')
parser.add_argument(
'-v', '--verbose',
action='count', default=1, dest='verbosity_level',
action='count', dest='verbosity_level',
help='more output (debug level)')
parser.add_argument(
'--save-debug-log',

View File

@ -34,10 +34,10 @@ def setup_root_logger():
def setup_console_logging(config, verbosity_level):
if verbosity_level == 0:
if verbosity_level == -1:
log_level = logging.WARNING
log_format = config['logging']['console_format']
elif verbosity_level >= 2:
elif verbosity_level >= 1:
log_level = logging.DEBUG
log_format = config['logging']['debug_format']
else: