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 #1723 from avimar/git-order

Browse Source 
Fix order for git checkout / git pull
This commit is contained in:
Thomas S Hatch 2012-07-29 08:58:04 -07:00
commit 0195b360a1
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/states/git.py
View File

@ -70,9 +70,11 @@ def latest(name,
ret,
('Repository {0} update is probably required (current '
'revision is {1})').format(target, current_rev))
__salt__['git.pull'](target, user=runas)
if rev:
__salt__['git.checkout'](target, rev, user=runas)
__salt__['git.pull'](target, user=runas)
if submodules:
__salt__['git.submodule'](target, user=runas)