Merge pull request #1769 from eyecat/devel
Checking pip uninstall output in both stdout and stderr
This commit is contained in:
commit
bf38fe315a
1 changed files with 3 additions and 2 deletions
|
@ -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)
|
||||||
|
|
Loading…
Reference in a new issue