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 #44542 from lozzd/patch-1

Browse Source 
Clarify error for compound command arguments
This commit is contained in:
Nicole Thomas 2017-11-17 12:13:16 -05:00 committed by GitHub
commit c032439a0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
salt/utils/parsers.py
View File

@ -2157,9 +2157,12 @@ class SaltCMDOptionParser(six.with_metaclass(OptionParserMeta,
self.config['arg'].append([])
else:
self.config['arg'][cmd_index].append(arg)
if len(self.config['fun']) != len(self.config['arg']):
if len(self.config['fun']) > len(self.config['arg']):
self.exit(42, 'Cannot execute compound command without '
'defining all arguments.\n')
elif len(self.config['fun']) < len(self.config['arg']):
self.exit(42, 'Cannot execute compound command with more '
'arguments than commands.\n')
# parse the args and kwargs before sending to the publish
# interface
for i in range(len(self.config['arg'])):