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

Merge pull request #26921 from terminalmage/legacy_git_pillar_tests

Browse source 
Get rid of error in legacy git pillar when using branch mapping notation
This commit is contained in:
Justin Findlay 2015-09-10 14:06:29 -06:00
commit 757d3c4eab
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/pillar/git_pillar.py
View file

@ -316,6 +316,8 @@ class _LegacyGitPillar(object):
branch = opts.get('environment') or 'base'
if branch == 'base':
branch = opts.get('gitfs_base') or 'master'
elif ':' in branch:
branch = branch.split(':', 1)[0]
return branch
def update(self):