tabulon/cdist
1
0
Fork 0
forked from ungleich-public/cdist
Code Pull requests Activity

Fix log level when verbosity option is not specified

Browse source
This commit is contained in:
Darko Poljak 2019-09-20 19:50:55 +02:00
commit b657ba8221
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
cdist/argparse.py
View file

@ -21,6 +21,7 @@ parser = None
_verbosity_level_off = -2 _verbosity_level_off = -2
_verbosity_level = { _verbosity_level = {
None: logging.WARNING,
_verbosity_level_off: logging.OFF, _verbosity_level_off: logging.OFF,
-1: logging.ERROR, -1: logging.ERROR,
0: logging.WARNING, 0: logging.WARNING,

10
cdist/preos/debootstrap/debootstrap.py
View file

@ -173,11 +173,11 @@ class Debian(object):
env = vars(args) env = vars(args)
new_env = {} new_env = {}
for key in env: for key in env:
if key == 'verbose': if key == 'verbose' and env[key]:
if env[key] >= 3: if env[key] >= 3:
new_env['debug'] = "yes" new_env['debug'] = "yes"
elif env[key] == 2: elif env[key] == 2:
new_env['verbose'] = "yes" new_env['verbose'] = "yes"
elif not env[key]: elif not env[key]:
new_env[key] = '' new_env[key] = ''
elif isinstance(env[key], bool) and env[key]: elif isinstance(env[key], bool) and env[key]: