From 391dc9d0e7b1d3309e257e2aabca2ad5c05d0d0b Mon Sep 17 00:00:00 2001 From: David Hyman Date: Fri, 2 Mar 2018 14:06:16 +0000 Subject: [PATCH 1/2] fix returncode for clean also fixes a typo --- pipenv/core.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pipenv/core.py b/pipenv/core.py index 978e170e..ec87e23f 100644 --- a/pipenv/core.py +++ b/pipenv/core.py @@ -2444,16 +2444,15 @@ def do_clean( if used_package in installed_package_names: del installed_package_names[installed_package_names.index(used_package)] - success = False + failure = False for apparent_bad_package in installed_package_names: - success = True - if dry_run: click.echo(apparent_bad_package) else: - click.echo(crayons.white('Unintalling {0}…'.format(repr(apparent_bad_package)), bold=True)) + click.echo(crayons.white('Uninstalling {0}…'.format(repr(apparent_bad_package)), bold=True)) # Uninstall the package. - delegator.run('{0} uninstall {1} -y'.format(which('pip'), apparent_bad_package)) + c = delegator.run('{0} uninstall {1} -y'.format(which('pip'), apparent_bad_package)) + failure |= c.return_code - sys.exit(int(success)) + sys.exit(int(failure)) From 463b6f6d8a9a08907085e4caf9a91f033a7ed6e7 Mon Sep 17 00:00:00 2001 From: David Hyman Date: Mon, 5 Mar 2018 09:32:13 +0000 Subject: [PATCH 2/2] clarify setting of failure flag --- pipenv/core.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pipenv/core.py b/pipenv/core.py index ec87e23f..62bb8776 100644 --- a/pipenv/core.py +++ b/pipenv/core.py @@ -2453,6 +2453,7 @@ def do_clean( # Uninstall the package. c = delegator.run('{0} uninstall {1} -y'.format(which('pip'), apparent_bad_package)) - failure |= c.return_code + if c.return_code != 0: + failure = True sys.exit(int(failure))