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

Further cleanup to add another rc check and remove a now redundent one.

Browse source
This commit is contained in:
Ashley Penney 2012-10-12 18:26:40 +00:00
parent d8e3f4db42
commit 3075ddb634
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
git
View file

@ -156,6 +156,8 @@ def pull(module, repo, dest, version):
cur_branch = b
if is_local_branch(module, dest, version) and not is_current_branch(module, dest, version):
(rc, out, err) = switch_version(module, dest, remote, version)
if rc != 0:
module.fail_json(msg=err)
cmd = "git pull -u origin"
cmd = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
@ -222,10 +224,6 @@ def main():
if rc != 0:
module.fail_json(msg=err)
# handle errors from clone or pull
if rc != 0:
module.fail_json(msg=err)
# switch to version specified regardless of whether
# we cloned or pulled
(rc, out, err) = switch_version(module, dest, remote, version)