Merge pull request #895 from lorin/pip-fail

Return both stdout and stderr on pip failures.
2012-08-17 17:08:24 -07:00 · 2012-08-17 17:08:24 -07:00 · 4e69818427
commit 4e69818427
parent fe923b9394 8af3403f65
1 changed files with 10 additions and 4 deletions
--- a/library/pip
+++ b/library/pip
@ -178,7 +178,13 @@ def main():
            err += err_pip

    if rc != 0:
-        module.fail_json(msg=err, cmd=cmd)
+        if not out:
+            msg = err
+        elif not err:
+            msg = out
+        else:
+            msg = "stdout: %s\n:stderr: %s" % (out, err)
+        module.fail_json(msg=msg, cmd=cmd)

    module.exit_json(changed=changed, cmd=cmd, name=name, version=version,
                     state=state, requirements=requirements, virtualenv=env)