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

RoleRequirement - Include stderr in the error message (#66006)

Browse source 
* RoleRequirement - Include stderr in the error message if there's a non-0 return code

* Don't try to concatenate str and bytes

Co-Authored-By: Sam Doran <sdoran@redhat.com>
This commit is contained in:
Sloane Hertel 2020-01-14 09:46:23 -05:00 committed by GitHub
parent b06e78c16c
commit 1b3ca349eb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/66006-RoleRequirement-include-stderr-error-msg.yaml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- RoleRequirement - include stderr in the error message if a scm command fails (https://github.com/ansible/ansible/issues/41336)

6
lib/ansible/playbook/role/requirement.py
View file

@ -145,11 +145,11 @@ class RoleRequirement(RoleDefinition):
except Exception as e:
ran = " ".join(cmd)
display.debug("ran %s:" % ran)
display.debug("\tstdout: " + stdout)
display.debug("\tstderr: " + stderr)
display.debug("\tstdout: " + to_text(stdout))
display.debug("\tstderr: " + to_text(stderr))
raise AnsibleError("when executing %s: %s" % (ran, to_native(e)))
if popen.returncode != 0:
raise AnsibleError("- command %s failed in directory %s (rc=%s)" % (' '.join(cmd), tempdir, popen.returncode))
raise AnsibleError("- command %s failed in directory %s (rc=%s) - %s" % (' '.join(cmd), tempdir, popen.returncode, to_native(stderr)))
if scm not in ['hg', 'git']:
raise AnsibleError("- scm %s is not currently supported" % scm)