saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Pip state run result should be False, not None, if installation error occurs.

Browse source 
Fixes #27971
This commit is contained in:
rallytime 2015-10-15 11:01:58 -06:00
parent 6f8925ee84
commit 5bcc89bb8e
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/states/pip_state.py
View file

@ -104,7 +104,7 @@ def _check_pkg_version_format(pkg):
if not HAS_PIP:
ret['comment'] = (
'An importable pip module is required but could not be found on '
'your system. This usually means that the system''s pip package '
'your system. This usually means that the system\'s pip package '
'is not installed properly.'
)
@ -179,7 +179,7 @@ def _check_if_installed(prefix, state_pkg_name, version_spec,
user=user, cwd=cwd)
prefix_realname = _find_key(prefix, pip_list)
except (CommandNotFoundError, CommandExecutionError) as err:
ret['result'] = None
ret['result'] = False
ret['comment'] = 'Error installing {0!r}: {1}'.format(state_pkg_name,
err)
return ret