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

fixes potential ext_pillar line mismatches

Browse Source
This commit is contained in:
Nicolas Limage 2014-06-23 18:24:33 +02:00
parent 25c11744d8
commit 78b6550f9b
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

@ -102,9 +102,9 @@ class GitPillar(object):
self.working_dir = ''
self.repo = None
needle = '{0} {1}'.format(self.branch, self.rp_location)
for idx, opts_dict in enumerate(self.opts['ext_pillar']):
if opts_dict.get('git', '').startswith(needle):
lopts = opts_dict.get('git', '').split()
if len(lopts) >= 2 and lopts[:2] == [self.branch, self.rp_location]:
rp_ = os.path.join(self.opts['cachedir'],
'pillar_gitfs', str(idx))