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

Adds missing show_timeout case

Browse Source
This commit is contained in:
iquaba 2014-05-11 14:14:43 -05:00
parent 1e99177c92
commit 0f3fd15fb2
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
salt/client/__init__.py
View File

@ -1025,6 +1025,7 @@ class LocalClient(object):
tgt='*',
tgt_type='glob',
verbose=False,
show_timeout=False,
show_jid=False):
'''
Get the returns for the command line interface via the event system
@ -1074,7 +1075,7 @@ class LocalClient(object):
# All minions have returned, break out of the loop
break
if int(time.time()) > timeout_at:
if verbose:
if verbose or show_timeout:
if self.opts.get('minion_data_cache', False) \
or tgt_type in ('glob', 'pcre', 'list'):
if len(found) < len(minions):