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 #27876 from terminalmage/git_pillar-AttributeError-2015.5

Browse source 
2015.5 branch: Fix traceback when 2015.8 git ext_pillar config schema used
This commit is contained in:
Mike Place 2015-10-13 08:58:45 -06:00
commit 41cccb3a30
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
salt/daemons/masterapi.py
View file

@ -61,7 +61,15 @@ def init_git_pillar(opts):
import git
except ImportError:
return pillargitfs
parts = opts_dict['git'].strip().split()
try:
parts = opts_dict['git'].strip().split()
except AttributeError:
log.error(
'Invalid git ext_pillar configuration found, please check '
'the master config file. Each git ext_pillar specified '
'must be a string.'
)
continue
try:
br = parts[0]
loc = parts[1]