From 3075ddb634d1bb27ebb930d5b51e7e09a7b6d709 Mon Sep 17 00:00:00 2001 From: Ashley Penney Date: Fri, 12 Oct 2012 18:26:40 +0000 Subject: [PATCH] Further cleanup to add another rc check and remove a now redundent one. --- git | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/git b/git index 6b5b5039bf1..89affbba115 100755 --- a/git +++ b/git @@ -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)