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

Already fixed on 2015.5

Browse Source
This commit is contained in:
Colton Myers 2015-08-25 12:17:29 -06:00
parent 71c0898fb5
commit a5dafa436c
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
salt/modules/state.py
View File

@ -619,7 +619,7 @@ def sls(mods,
)
# Backwards compatibility
saltenv = env
if not saltenv:
if saltenv is None:
if __opts__.get('environment', None):
saltenv = __opts__['environment']
else:
@ -633,9 +633,6 @@ def sls(mods,
else:
__opts__['pillarenv'] = pillarenv
if saltenv is None:
saltenv = __opts__['environment'] or 'base'
if queue:
_wait(kwargs.get('__pub_jid'))
else: