fancsali/cdist-backup
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Info command: support tilde expansion

Browse source
This commit is contained in:
Darko Poljak 2020-01-11 15:26:46 +01:00
commit 3f133dbc17
4 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
cdist/exec/util.py
View file

@ -24,6 +24,7 @@ import os
from tempfile import TemporaryFile
import cdist
import cdist.configuration
# IMPORTANT:
@ -200,3 +201,9 @@ def resolve_conf_dirs(configuration, add_conf_dirs):
conf_dirs.extend(add_conf_dirs)
conf_dirs = set(conf_dirs)
return conf_dirs
def resolve_conf_dirs_from_config_and_args(args):
cfg = cdist.configuration.Configuration(args)
configuration = cfg.get_config(section='GLOBAL')
return resolve_conf_dirs(configuration, args.conf_dir)