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

Merge pull request #35329 from hu-dabao/fix-tiny-salt-cli

Browse Source 
sys.doc will skip all not connected minions
This commit is contained in:
Mike Place 2016-08-10 20:18:22 +09:00 committed by GitHub
commit 3446dc9ec6
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
salt/cli/salt.py
View File

@ -250,8 +250,8 @@ class SaltCMD(parsers.SaltCMDOptionParser):
print_cli('---------------------------')
print_cli('Errors')
print_cli('---------------------------')
for minion in errors:
print_cli(self._format_error(minion))
for error in errors:
print_cli(self._format_error(error))
def _print_returns_summary(self, ret):
'''
@ -361,12 +361,12 @@ class SaltCMD(parsers.SaltCMDOptionParser):
if isinstance(ret, str):
self.exit(2, '{0}\n'.format(ret))
for host in ret:
if ret[host] == 'Minion did not return. [Not connected]':
if isinstance(ret[host], string_types) and ret[host].startswith("Minion did not return"):
continue
for fun in ret[host]:
if fun not in docs and ret[host][fun]:
docs[fun] = ret[host][fun]
if 'output' in self.config:
if self.options.output:
for fun in sorted(docs):
salt.output.display_output({fun: docs[fun]}, 'nested', self.config)
else: