McSinyx
/
pip
mirror of https://github.com/pypa/pip
1
1
Fork 0
Code Issues Releases Activity

pull #3522 - Join if statements, add to changelog

This commit is contained in:
Salvatore Rinchiera 2016-03-03 19:57:32 +00:00
parent eb2c584c2a
commit 0dc868a1a1
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES.txt
View File

@ -1,5 +1,8 @@
**8.1.0 (unreleased)**
* Fixed an issue where ``call_subprocess`` would crash trying to print debug
data on child process failure (:issue:`3521`, :pull:`3522`).
* Exclude the wheel package from the `pip freeze` output (like pip and setuptools).
:issue:`2989`.

18
pip/utils/__init__.py
View File

@ -703,15 +703,15 @@ def call_subprocess(cmd, show_stdout=True, cwd=None,
spinner.finish("done")
if proc.returncode:
if on_returncode == 'raise':
if logger.getEffectiveLevel() > std_logging.DEBUG:
if not show_stdout:
logger.info(
'Complete output from command %s:', command_desc,
)
logger.info(
''.join(all_output) +
'\n----------------------------------------'
)
if (logger.getEffectiveLevel() > std_logging.DEBUG and
not show_stdout):
logger.info(
'Complete output from command %s:', command_desc,
)
logger.info(
''.join(all_output) +
'\n----------------------------------------'
)
raise InstallationError(
'Command "%s" failed with error code %s in %s'
% (command_desc, proc.returncode, cwd))