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

Merge pull request #732 from willthames/fix_git_fail_json

Browse source 
Fixes for git module when it fails.
This commit is contained in:
Michael DeHaan 2012-07-31 05:04:47 -07:00
commit dcff6ec4d6
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
git
View file

@ -163,24 +163,24 @@ def main():
if not os.path.exists(gitconfig): if not os.path.exists(gitconfig):
(rc, out, err) = clone(repo, dest) (rc, out, err) = clone(repo, dest)
if rc != 0: if rc != 0:
module.fail_json(out=out, err=err, rc=rc) module.fail_json(msg=err)
else: else:
# else do a pull # else do a pull
before = get_version(dest) before = get_version(dest)
(rc, out, err) = reset(dest) (rc, out, err) = reset(dest)
if rc != 0: if rc != 0:
module.fail_json(out=out, err=err, rc=rc) module.fail_json(msg=err)
(rc, out, err) = pull(module, repo, dest, version) (rc, out, err) = pull(module, repo, dest, version)
# handle errors from clone or pull # handle errors from clone or pull
if out.find('error') != -1 or err.find('ERROR') != -1: if out.find('error') != -1 or err.find('ERROR') != -1:
module.fail_json(out=out, err=err) module.fail_json(msg=err)
# switch to version specified regardless of whether # switch to version specified regardless of whether
# we cloned or pulled # we cloned or pulled
(rc, out, err) = switch_version(module, dest, remote, version) (rc, out, err) = switch_version(module, dest, remote, version)
if err.find('error') != -1: if err.find('error') != -1:
module.fail_json(out=out, err=err) module.fail_json(msg=err)
# determine if we changed anything # determine if we changed anything
after = get_version(dest) after = get_version(dest)