mirror of
https://github.com/valitydev/salt.git
synced 2024-11-07 00:55:19 +00:00
Merge branch '2016.11' into '2017.7'
No conflicts.
This commit is contained in:
commit
5d9a1e91e9
@ -274,7 +274,7 @@ def _get_extra_options(**kwargs):
|
||||
ret = []
|
||||
kwargs = salt.utils.clean_kwargs(**kwargs)
|
||||
for key, value in six.iteritems(kwargs):
|
||||
if isinstance(key, six.string_types):
|
||||
if isinstance(value, six.string_types):
|
||||
ret.append('--{0}=\'{1}\''.format(key, value))
|
||||
elif value is True:
|
||||
ret.append('--{0}'.format(key))
|
||||
|
Loading…
Reference in New Issue
Block a user