saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

if expect_minions is passed use that instead

Browse source 
In the salt/states/saltmod.py, we set expect minions sometimes and pass that
through.  In this instance, we should use the expect_minions that is passed so
that it does not get passed along twice.
This commit is contained in:
Daniel Wallace 2017-10-05 10:08:20 -06:00
parent 6252f82f58
commit b615ce1762
No known key found for this signature in database
GPG key ID: 5FA5E5544F010D48
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/client/__init__.py
View file

@ -1582,7 +1582,7 @@ class LocalClient(object):
timeout=timeout,
tgt=tgt,
tgt_type=tgt_type,
expect_minions=(verbose or show_timeout),
expect_minions=(kwargs.pop('expect_minions', False) or verbose or show_timeout),
**kwargs
):
log.debug('return event: %s', ret)