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

Fix base branch detection for git_pillar

Browse source 
Resolves #29015.
This commit is contained in:
Erik Johnson 2015-11-20 01:19:44 -06:00
parent 1cd9a4d1b4
commit 744487864d
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/utils/gitfs.py
View file

@ -2343,7 +2343,7 @@ class GitPillar(GitBase):
if repo.env:
env = repo.env
else:
base_branch = self.opts['{0}_branch'.format(self.role)]
base_branch = self.opts['{0}_base'.format(self.role)]
env = 'base' if repo.branch == base_branch else repo.branch
self.pillar_dirs[cachedir] = env