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

Raise exception if more than one opt is passed in the same string arg

Browse Source
This commit is contained in:
Erik Johnson 2016-08-29 22:27:37 -05:00
parent 6bd0f98062
commit e616d5b509
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
salt/modules/file.py
View File

@ -5221,10 +5221,16 @@ def grep(path,
split_opts = []
for opt in opts:
try:
opt = salt.utils.shlex_split(opt)
split = salt.utils.shlex_split(opt)
except AttributeError:
opt = salt.utils.shlex_split(str(opt))
split_opts.extend(opt)
split = salt.utils.shlex_split(str(opt))
if len(split) > 1:
raise SaltInvocationError(
'Passing multiple command line arguments in a single string '
'is not supported, please pass the following arguments '
'separately: {0}'.format(opt)
)
split_opts.extend(split)
cmd = ['grep'] + split_opts + [pattern, path]
try: