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

Merge pull request #26389 from rallytime/bp-26160

Browse source 
Back-port #26160 to 2015.5
This commit is contained in:
Mike Place 2015-08-17 13:09:16 -06:00
commit 2fd1e06343
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
salt/states/pip_state.py
View file

@ -57,7 +57,7 @@ def __virtual__():
'''
Only load if the pip module is available in __salt__
'''
if HAS_PIP and 'pip.list' in __salt__:
if 'pip.list' in __salt__:
return __virtualname__
return False
@ -98,6 +98,16 @@ def _check_pkg_version_format(pkg):
ret = {'result': False, 'comment': None,
'prefix': None, 'version_spec': None}
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 '
'is not installed properly.'
)
return ret
from_vcs = False
try:
# Get the requirement object from the pip library