cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #1769 from eyecat/devel

Browse source 
Checking pip uninstall output in both stdout and stderr
This commit is contained in:
Brian Coca 2015-07-21 22:55:22 -04:00
commit bf38fe315a
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
packaging/language/pip.py
View file

@ -155,7 +155,7 @@ def _get_cmd_options(module, cmd):
words = stdout.strip().split() words = stdout.strip().split()
cmd_options = [ x for x in words if x.startswith('--') ] cmd_options = [ x for x in words if x.startswith('--') ]
return cmd_options return cmd_options
def _get_full_name(name, version=None): def _get_full_name(name, version=None):
if version is 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) rc, out_pip, err_pip = module.run_command(cmd, path_prefix=path_prefix, cwd=this_dir)
out += out_pip out += out_pip
err += err_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 pass # rc is 1 when attempting to uninstall non-installed package
elif rc != 0: elif rc != 0:
_fail(module, cmd, out, err) _fail(module, cmd, out, err)