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

pygit2: Properly resolve base saltenv from tag ref

Browse source 
Fixes #27432.
This commit is contained in:
Erik Johnson 2015-11-20 02:38:53 -06:00
parent 0c592ab552
commit 1e6c46f554
1 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
salt/utils/gitfs.py
View file

@ -887,19 +887,28 @@ class Pygit2(GitProvider):
Check the refs and return a list of the ones which can be used as salt
environments.
'''
def _check_ref(env_set, base_ref, rname):
'''
Check the ref and resolve it as the base_ref if it matches. If the
resulting env is exposed via whitelist/blacklist, add it to the
env_set.
'''
if base_ref is not None and base_ref == rname:
rname = 'base'
if self.env_is_exposed(rname):
env_set.add(rname)
ret = set()
base_ref = getattr(self, 'base', None)
for ref in self.repo.listall_references():
ref = re.sub('^refs/', '', ref)
rtype, rspec = ref.split('/', 1)
rtype, rname = ref.split('/', 1)
if rtype == 'remotes':
parted = rspec.partition('/')
rspec = parted[2] if parted[2] else parted[0]
if hasattr(self, 'base') and self.base == rspec:
rspec = 'base'
if self.env_is_exposed(rspec):
ret.add(rspec)
elif rtype == 'tags' and self.env_is_exposed(rspec):
ret.add(rspec)
parted = rname.partition('/')
rname = parted[2] if parted[2] else parted[0]
_check_ref(ret, base_ref, rname)
elif rtype == 'tags':
_check_ref(ret, base_ref, rname)
return ret
def fetch(self):