valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Two fixes in _get_envs()

Browse Source 
1. Don't get client_envs twice.
2. Don't add 'base' more than once.
This commit is contained in:
Erik Johnson 2016-09-01 22:53:40 -05:00
parent ab9a89d6dc
commit e36d6839d1
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

@ -2505,8 +2505,8 @@ class BaseHighState(object):
''' '''
envs = ['base'] envs = ['base']
if 'file_roots' in self.opts: if 'file_roots' in self.opts:
envs.extend(list(self.opts['file_roots'])) envs.extend([x for x in list(self.opts['file_roots'])
client_envs = self.client.envs() if x not in envs])
env_order = self.opts.get('env_order', []) env_order = self.opts.get('env_order', [])
client_envs = self.client.envs() client_envs = self.client.envs()
if env_order and client_envs: if env_order and client_envs: