From 51666c6defe04dcb976850be515f47a35a0305dd Mon Sep 17 00:00:00 2001 From: Yuhui Huang Date: Tue, 21 Jul 2015 16:07:25 -0700 Subject: [PATCH] Checking pip uninstall output in both stdout and stderr --- packaging/language/pip.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packaging/language/pip.py b/packaging/language/pip.py index ec0bf93979c..8bbae35038d 100644 --- a/packaging/language/pip.py +++ b/packaging/language/pip.py @@ -155,7 +155,7 @@ def _get_cmd_options(module, cmd): words = stdout.strip().split() cmd_options = [ x for x in words if x.startswith('--') ] return cmd_options - + def _get_full_name(name, version=None): if version is None: @@ -356,7 +356,8 @@ def main(): rc, out_pip, err_pip = module.run_command(cmd, path_prefix=path_prefix, cwd=this_dir) out += out_pip err += err_pip - if rc == 1 and state == 'absent' and 'not installed' in out_pip: + if rc == 1 and state == 'absent' and \ + ('not installed' in out_pip or 'not installed' in err_pip): pass # rc is 1 when attempting to uninstall non-installed package elif rc != 0: _fail(module, cmd, out, err)