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

Improve error reporting when git binary fail (#3266)

Browse source 
Showing stderr or stdout is a great help to understand
when something go south.
This commit is contained in:
Michael Scherer 2016-05-20 18:45:53 +02:00 committed by Matt Clay
parent b8175f70ce
commit 82df6f981e
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/ansible/modules/source_control/git.py
View file

@ -296,7 +296,7 @@ def get_submodule_versions(git_path, module, dest, version='HEAD'):
cmd = [git_path, 'submodule', 'foreach', git_path, 'rev-parse', version] cmd = [git_path, 'submodule', 'foreach', git_path, 'rev-parse', version]
(rc, out, err) = module.run_command(cmd, cwd=dest) (rc, out, err) = module.run_command(cmd, cwd=dest)
if rc != 0: if rc != 0:
module.fail_json(msg='Unable to determine hashes of submodules') module.fail_json(msg='Unable to determine hashes of submodules', stdout=out, stderr=err, rc=rc)
submodules = {} submodules = {}
subm_name = None subm_name = None
for line in out.splitlines(): for line in out.splitlines():
@ -400,7 +400,7 @@ def get_remote_head(git_path, module, dest, version, remote, bare):
return version return version
(rc, out, err) = module.run_command(cmd, check_rc=True, cwd=cwd) (rc, out, err) = module.run_command(cmd, check_rc=True, cwd=cwd)
if len(out) < 1: if len(out) < 1:
module.fail_json(msg="Could not determine remote revision for %s" % version) module.fail_json(msg="Could not determine remote revision for %s" % version, stdout=out, stderr=err, rc=rc)
if tag: if tag:
# Find the dereferenced tag if this is an annotated tag. # Find the dereferenced tag if this is an annotated tag.
@ -427,7 +427,7 @@ def get_branches(git_path, module, dest):
cmd = '%s branch -a' % (git_path,) cmd = '%s branch -a' % (git_path,)
(rc, out, err) = module.run_command(cmd, cwd=dest) (rc, out, err) = module.run_command(cmd, cwd=dest)
if rc != 0: if rc != 0:
module.fail_json(msg="Could not determine branch data - received %s" % out) module.fail_json(msg="Could not determine branch data - received %s" % out, stdout=out, stderr=err)
for line in out.split('\n'): for line in out.split('\n'):
branches.append(line.strip()) branches.append(line.strip())
return branches return branches
@ -437,7 +437,7 @@ def get_tags(git_path, module, dest):
cmd = '%s tag' % (git_path,) cmd = '%s tag' % (git_path,)
(rc, out, err) = module.run_command(cmd, cwd=dest) (rc, out, err) = module.run_command(cmd, cwd=dest)
if rc != 0: if rc != 0:
module.fail_json(msg="Could not determine tag data - received %s" % out) module.fail_json(msg="Could not determine tag data - received %s" % out, stdout=out, stderr=err)
for line in out.split('\n'): for line in out.split('\n'):
tags.append(line.strip()) tags.append(line.strip())
return tags return tags
@ -653,7 +653,7 @@ def set_remote_branch(git_path, module, dest, remote, version, depth):
cmd = "%s fetch --depth=%s %s %s" % (git_path, depth, remote, branchref) cmd = "%s fetch --depth=%s %s %s" % (git_path, depth, remote, branchref)
(rc, out, err) = module.run_command(cmd, cwd=dest) (rc, out, err) = module.run_command(cmd, cwd=dest)
if rc != 0: if rc != 0:
module.fail_json(msg="Failed to fetch branch from remote: %s" % version) module.fail_json(msg="Failed to fetch branch from remote: %s" % version, stdout=out, stderr=err, rc=rc)
def switch_version(git_path, module, dest, remote, version, verify_commit): def switch_version(git_path, module, dest, remote, version, verify_commit):
cmd = '' cmd = ''
@ -700,7 +700,7 @@ def verify_commit_sign(git_path, module, dest, version):
cmd = "%s verify-commit %s" % (git_path, version) cmd = "%s verify-commit %s" % (git_path, version)
(rc, out, err) = module.run_command(cmd, cwd=dest) (rc, out, err) = module.run_command(cmd, cwd=dest)
if rc != 0: if rc != 0:
module.fail_json(msg='Failed to verify GPG signature of commit/tag "%s"' % version) module.fail_json(msg='Failed to verify GPG signature of commit/tag "%s"' % version, stdout=out, stderr=err, rc=rc)
return (rc, out, err) return (rc, out, err)
# =========================================== # ===========================================