mark/cdist
1
0
Fork 0
forked from ungleich-public/cdist
Code Issues Pull requests Projects Releases Wiki Activity

Fix determining beta value through configuration

Browse source
This commit is contained in:
Darko Poljak 2018-03-01 19:33:22 +01:00
commit 23292e5cad
3 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
cdist/argparse.py
View file

@ -126,8 +126,7 @@ def get_parsers():
parser['beta'].add_argument( parser['beta'].add_argument(
'-b', '--beta', '-b', '--beta',
help=('Enable beta functionality. '), help=('Enable beta functionality. '),
action='store_true', dest='beta', action='store_true', dest='beta', default=None)
default=False)
# Main subcommand parser # Main subcommand parser
parser['main'] = argparse.ArgumentParser( parser['main'] = argparse.ArgumentParser(

7
cdist/configuration.py
View file

@ -409,7 +409,12 @@ class Configuration(metaclass=Singleton):
if option in args: if option in args:
dst_opt = self.ARG_OPTION_MAPPING[option] dst_opt = self.ARG_OPTION_MAPPING[option]
option_object = self.CONFIG_FILE_OPTIONS['GLOBAL'][dst_opt] option_object = self.CONFIG_FILE_OPTIONS['GLOBAL'][dst_opt]
if args[option] or isinstance(option_object, BooleanOption): # If option is in args.
# Also if it is boolean but only if not None - this allows
# False to override True.
if (args[option] or
(isinstance(option_object, BooleanOption) and
args[option] is not None)):
d[dst_opt] = args[option] d[dst_opt] = args[option]
return d return d

1
docs/changelog
View file

@ -10,6 +10,7 @@ next:
* Core: Fix non-existent manifest non graceful handling (Darko Poljak) * Core: Fix non-existent manifest non graceful handling (Darko Poljak)
* Core: Fix main and inventory parent argparse options (Darko Poljak) * Core: Fix main and inventory parent argparse options (Darko Poljak)
* Core: Fix lost error info with parallel jobs (option -j) (Darko Poljak) * Core: Fix lost error info with parallel jobs (option -j) (Darko Poljak)
* Core: Fix determining beta value through configuration (Darko Poljak)
4.8.0: 2018-02-14 4.8.0: 2018-02-14
* Core: Skip empty lines in parameter files (Darko Poljak) * Core: Skip empty lines in parameter files (Darko Poljak)