valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2626 from FireHost/fix_virtualenv_requirements

Browse Source 
Fix virtualenv requirements
This commit is contained in:
Thomas S Hatch 2012-11-18 14:32:24 -08:00
commit b118b97938
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
salt/states/virtualenv.py
View File

@ -55,13 +55,14 @@ def managed(name,
# Bail out early if the specified requirements file can't be found
if requirements:
reqs_hash = __salt__['cp.hash_file'](requirements, __env__)
orig_path = requirements
requirements = __salt__['cp.cache_file'](requirements, __env__)
if not reqs_hash:
if not requirements:
ret.update({
'result': False,
'comment': "pip requirements file '{0}' not found".format(
requirements)})
orig_path)})
return ret
@ -110,6 +111,10 @@ def managed(name,
requirements=requirements, bin_env=name, runas=runas, cwd=cwd
)
ret['result'] &= _ret['retcode']==0
if _ret['retcode'] > 0:
ret['comment'] = '{0}\n{1}\n{2}'.format(ret['comment'],
_ret['stdout'],
_ret['stderr'])
after = set(__salt__['pip.freeze'](bin_env=name))