valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3755 from s0undt3ch/issues/3754

Browse Source 
Don't override, instead extend `module_dirs`. Fixes #3754.
This commit is contained in:
Thomas S Hatch 2013-02-17 19:22:20 -08:00
commit 78763ae6d5
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
salt/utils/parsers.py
View File

@ -1054,9 +1054,11 @@ class SaltCallOptionParser(OptionParser, ConfigDirMixIn, MergeConfigMixIn,
)
self.add_option(
'-m', '--module-dirs',
default='',
help=('Specify an additional directories to pull modules from, '
'multiple directories can be delimited by commas')
default=[],
action='append',
help=('Specify an additional directory to pull modules from. '
'Multiple directories can be provided by passing '
'`-m/--module-dirs` multiple times.')
)
self.add_option(
'-d', '--doc', '--documentation',
@ -1099,8 +1101,15 @@ class SaltCallOptionParser(OptionParser, ConfigDirMixIn, MergeConfigMixIn,
)
def process_module_dirs(self):
if self.options.module_dirs:
self.config['module_dirs'] = self.options.module_dirs.split(',')
for module_dir in self.options.module_dirs:
# Provide some backwards compatibility with previous comma
# delimited format
if ',' in module_dir:
self.config.setdefault('module_dirs', []).extend(
module_dir.split(',')
)
continue
self.config.setdefault('module_dirs', []).append(module_dir)
class SaltRunOptionParser(OptionParser, ConfigDirMixIn, MergeConfigMixIn,