Merge pull request #790 from sfromm/fixgit

Fix error handling when switching versions
pull/804/merge
Michael DeHaan 12 years ago
commit ae7e1928df

@ -58,11 +58,6 @@ def reset(dest):
rc = cmd.returncode
return (rc, out, err)
def switchLocalBranch( branch ):
cmd = "git checkout %s" % branch
cmd = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
return cmd.communicate()
def get_branches(module, dest):
os.chdir(dest)
branches = []
@ -156,7 +151,7 @@ def main():
gitconfig = os.path.join(dest, '.git', 'config')
out, err, status = (None, None, None)
rc, out, err, status = (0, None, None, None)
# if there is no git configuration, do a clone operation
# else pull and switch the version
@ -180,7 +175,7 @@ def main():
# switch to version specified regardless of whether
# we cloned or pulled
(rc, out, err) = switch_version(module, dest, remote, version)
if err.find('error') != -1:
if rc != 0:
module.fail_json(msg=err)
# determine if we changed anything

Loading…
Cancel
Save