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

don't need to check venv, raise cmdexecutionerrors in virtualenv mod

Browse Source
This commit is contained in:
Thomas S Hatch 2014-09-11 09:18:50 -06:00
parent c558748b5f
commit 04873c9da7
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
salt/modules/virtualenv_mod.py
View File

@ -342,12 +342,10 @@ def get_resource_path(venv, package_or_requirement, resource_name):
salt '*' virtualenv.get_resource_path /path/to/my/venv my_package my/resource.xml
'''
if not salt.utils.verify.safe_py_code(venv):
return ''
if not salt.utils.verify.safe_py_code(package_or_requirement):
return ''
raise salt.exceptions.CommandExecutionError
if not salt.utils.verify.safe_py_code(resource_name):
return ''
raise salt.exceptions.CommandExecutionError
bin_path = os.path.join(venv, 'bin/python')
if not os.path.exists(bin_path):
@ -366,12 +364,10 @@ def get_resource_content(venv, package_or_requirement, resource_name):
salt '*' virtualenv.get_resource_content /path/to/my/venv my_package my/resource.xml
'''
if not salt.utils.verify.safe_py_code(venv):
return ''
if not salt.utils.verify.safe_py_code(package_or_requirement):
return ''
raise salt.exceptions.CommandExecutionError
if not salt.utils.verify.safe_py_code(resource_name):
return ''
raise salt.exceptions.CommandExecutionError
bin_path = os.path.join(venv, 'bin/python')
if not os.path.exists(bin_path):