valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #23509 from keesbos/Catch_empty_environment

Browse Source 
Catch the unset (empty/None) environment case
This commit is contained in:
Thomas S Hatch 2015-05-09 07:24:37 -06:00
commit 2bb09b7ee7
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):