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

Catch the unset (empty/None) environment case

Browse source
This commit is contained in:
Kees Bos 2015-05-09 07:04:36 +02:00
parent 6d42f30271
commit 6dedeaccd2
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/pillar/git_pillar.py
View file

@ -179,9 +179,9 @@ class GitPillar(object):
def map_branch(self, branch, opts=None):
opts = __opts__ if opts is None else opts
if branch == '__env__':
branch = opts.get('environment', 'base')
branch = opts.get('environment') or 'base'
if branch == 'base':
branch = opts.get('gitfs_base', 'master')
branch = opts.get('gitfs_base') or 'master'
return branch
def update(self):