cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

removed unecessary branch addition from switchver

Browse source
This commit is contained in:
felix 2012-05-08 16:24:29 -04:00
parent 325b397ac0
commit 5f8e2a3651
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
library/git
View file

@ -155,7 +155,7 @@ def pull(repo, dest, branch):
cmd = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) cmd = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
return cmd.communicate() return cmd.communicate()
def switchver(version, dest, branch): def switchver(version, dest):
''' once pulled, switch to a particular SHA or tag ''' ''' once pulled, switch to a particular SHA or tag '''
os.chdir(dest) os.chdir(dest)
if version != 'HEAD': if version != 'HEAD':
@ -163,7 +163,6 @@ def switchver(version, dest, branch):
else: else:
# is there a better way to do this? # is there a better way to do this?
cmd = "git rebase origin" cmd = "git rebase origin"
cmd = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) cmd = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
(out, err) = cmd.communicate() (out, err) = cmd.communicate()
return (out, err) return (out, err)
@ -195,7 +194,7 @@ if out.find('error') != -1:
# switch to version specified regardless of whether # switch to version specified regardless of whether
# we cloned or pulled # we cloned or pulled
(out, err) = switchver(version, dest, branch) (out, err) = switchver(version, dest)
if err.find('error') != -1: if err.find('error') != -1:
fail_json(out=out, err=err) fail_json(out=out, err=err)