From f0931b5960842da0642678de20f9397d7f7d0204 Mon Sep 17 00:00:00 2001 From: u348095 Date: Tue, 31 Jul 2012 12:51:26 +1000 Subject: [PATCH] Fixes for git module when it fails. * module.fail_json *must* have msg argument Using http://github.com/ rather than git://github.com/ as it gets through more firewalls --- git | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/git b/git index d493df7bef0..b016ddceaf8 100755 --- a/git +++ b/git @@ -165,24 +165,24 @@ def main(): if not os.path.exists(gitconfig): (rc, out, err) = clone(repo, dest) if rc != 0: - module.fail_json(out=out, err=err, rc=rc) + module.fail_json(msg=err) else: # else do a pull before = get_version(dest) (rc, out, err) = reset(dest) 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) # handle errors from clone or pull 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 # we cloned or pulled (rc, out, err) = switch_version(module, dest, remote, version) if err.find('error') != -1: - module.fail_json(out=out, err=err) + module.fail_json(msg=err) # determine if we changed anything after = get_version(dest)