Correctly include process output with the thrown exception.

Kami · Kami · commit d26470a1daa1 · 2018-07-25T12:57:05.000+02:00
diff --git a/codecov/__init__.py b/codecov/__init__.py
@@ -171,7 +171,7 @@ def check_output(cmd, **popen_args):
     process = Popen(cmd, stdout=PIPE, **popen_args)
     output, _ = process.communicate()
     if process.returncode:
-        raise CalledProcessError(process.returncode, cmd)
+        raise CalledProcessError(process.returncode, cmd, output)
     else:
         assert process.returncode == 0
         return output.decode('utf-8')
@@ -181,8 +181,8 @@ def try_to_run(cmd):
     try:
         return check_output(cmd, shell=True)
     except subprocess.CalledProcessError as e:
-        write('    Error running `%s`: output=%s, returncode=%s, e=%s' % (cmd,
-            str(getattr(e, 'output', '')), e.returncode, str(e)))
+        write('    Error running `%s`: output=%s, returncode=%s' % (cmd, str(getattr(e, 'output', str(e))),
+                                                                    e.returncode))
 
 
 def remove_non_ascii(data):
