fnux/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Release preos, i.e. make it non-beta

Browse source
This commit is contained in:
Darko Poljak 2019-09-20 19:56:17 +02:00
commit 97bcfcc23c
4 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cdist/argparse.py
View file

@ -9,7 +9,7 @@ import cdist.preos
# set of beta sub-commands
BETA_COMMANDS = set(('install', 'inventory', 'preos', ))
BETA_COMMANDS = set(('install', 'inventory', ))
# set of beta arguments for sub-commands
BETA_ARGS = {
'config': set(('tag', 'all_tagged_hosts', 'use_archiving', )),

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

@ -145,7 +145,6 @@ class Debian(object):
log = logging.getLogger(cls.__name__)
parser = cls.get_parser()
cdist.argparse.add_beta_command(cls._preos_name)
args = parser.parse_args(argv)
if args.script and not args.mirror:
raise cdist.Error("script option cannot be used without "
@ -174,10 +173,10 @@ class Debian(object):
new_env = {}
for key in env:
if key == 'verbose' and env[key]:
if env[key] >= 3:
new_env['debug'] = "yes"
elif env[key] == 2:
new_env['verbose'] = "yes"
if env[key] >= 3:
new_env['debug'] = "yes"
elif env[key] == 2:
new_env['verbose'] = "yes"
elif not env[key]:
new_env[key] = ''
elif isinstance(env[key], bool) and env[key]: