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

pop None

Browse source 
We don't want to error here, so if for some reason the key is not populated,
just return a None instead of erroring.
This commit is contained in:
Daniel Wallace 2017-11-27 10:04:23 -07:00
parent d6ccf4bb30
commit c6733ac1ee
No known key found for this signature in database
GPG key ID: 5FA5E5544F010D48
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/state.py
View file

@ -1878,8 +1878,8 @@ class State(object):
sys.modules[self.states[cdata['full']].__module__].__opts__[
'test'] = test
self.state_con.pop('runas')
self.state_con.pop('runas_password')
self.state_con.pop('runas', None)
self.state_con.pop('runas_password', None)
# If format_call got any warnings, let's show them to the user
if 'warnings' in cdata: