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

Merge pull request #7927 from tones111/pillar

Browse Source 
git_pillar: Don't merge updates
This commit is contained in:
Thomas S Hatch 2013-10-18 09:26:31 -07:00
commit f260e80e0a
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
salt/pillar/git_pillar.py
View File

@ -100,11 +100,10 @@ def update(branch, repo_location):
pid = os.getpid()
repo = init(branch, repo_location)
try:
repo.git.checkout(branch)
repo.git.checkout("origin/" + branch)
except git.exc.GitCommandError as e:
logging.error('Unable to checkout branch {0}: {1}'.format(branch, e))
return False
repo.git.pull()
return True