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

gitfs: Fix identification of base env when saltenv mapping is disabled

Browse source
This commit is contained in:
Erik Johnson 2018-04-30 15:30:07 -05:00
parent 091e4cf9a6
commit 7b8127f336
No known key found for this signature in database
GPG key ID: 5E5583C437808F3F
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
salt/utils/gitfs.py
View file

@ -467,7 +467,10 @@ class GitProvider(object):
if rname in self.saltenv_revmap:
env_set.update(self.saltenv_revmap[rname])
else:
env_set.add('base' if rname == self.base else rname)
if rname == self.base:
env_set.add('base')
elif not self.disable_saltenv_mapping:
env_set.add(rname)
use_branches = 'branch' in self.ref_types
use_tags = 'tag' in self.ref_types
@ -2692,9 +2695,7 @@ class GitFS(GitBase):
return cache_match
ret = set()
for repo in self.remotes:
repo_envs = set()
if not repo.disable_saltenv_mapping:
repo_envs.update(repo.envs())
repo_envs = repo.envs()
for env_list in six.itervalues(repo.saltenv_revmap):
repo_envs.update(env_list)
ret.update([x for x in repo_envs if repo.env_is_exposed(x)])