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

Revert "Fix pip module for python 3"

Browse Source 
This reverts commit 06ac67c84a.
This commit is contained in:
Pedro Algarvio 2013-07-13 18:14:32 +01:00
parent 7c61db7260
commit fc63bb4469
1 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
salt/modules/pip.py
View File

@ -36,7 +36,7 @@ def _get_pip_bin(bin_env):
which_result = __salt__['cmd.which_bin'](['pip2', 'pip', 'pip-python'])
if which_result is None:
raise CommandNotFoundError('Could not find a `pip` binary')
return which_result, 'base'
return which_result
# try to get pip bin from env
if os.path.isdir(bin_env):
@ -45,13 +45,13 @@ def _get_pip_bin(bin_env):
else:
pip_bin = os.path.join(bin_env, 'bin', 'pip')
if os.path.isfile(pip_bin):
return pip_bin, {'VIRTUAL_ENV': bin_env}
return pip_bin
raise CommandNotFoundError('Could not find a `pip` binary')
return bin_env, 'base'
return bin_env
def _get_cached_requirements(requirements, __env__):
def _get_cached_requirements(requirements):
'''Get the location of a cached requirements file; caching if necessary.'''
cached_requirements = __salt__['cp.is_cached'](
requirements, __env__
@ -114,7 +114,8 @@ def install(pkgs=None,
runas=None,
no_chown=False,
cwd=None,
activate=False):
activate=False,
__env__='base'):
'''
Install packages with pip
@ -228,8 +229,7 @@ def install(pkgs=None,
if env and not bin_env:
bin_env = env
pip_bin, __env__ = _get_pip_bin(bin_env)
cmd = [pip_bin, 'install']
cmd = [_get_pip_bin(bin_env), 'install']
if activate and bin_env:
if not salt.utils.is_windows():
@ -272,8 +272,7 @@ def install(pkgs=None,
treq = None
if requirements:
if requirements.startswith('salt://'):
cached_requirements = _get_cached_requirements(requirements,
__env__)
cached_requirements = _get_cached_requirements(requirements)
if not cached_requirements:
return {
'result': False,
@ -415,7 +414,7 @@ def install(pkgs=None,
cmd.append('--install-option={0}'.format(opt))
try:
return __salt__['cmd.run_all'](' '.join(cmd), runas=runas, cwd=cwd, env=__env__)
return __salt__['cmd.run_all'](' '.join(cmd), runas=runas, cwd=cwd)
finally:
if treq is not None:
try:
@ -431,7 +430,8 @@ def uninstall(pkgs=None,
proxy=None,
timeout=None,
runas=None,
cwd=None):
cwd=None,
__env__='base'):
'''
Uninstall packages with pip
@ -475,8 +475,7 @@ def uninstall(pkgs=None,
salt '*' pip.uninstall <package name> bin_env=/path/to/pip_bin
'''
pip_bin, __env__ = _get_pip_bin(bin_env)
cmd = [pip_bin, 'uninstall', '-y']
cmd = [_get_pip_bin(bin_env), 'uninstall', '-y']
if pkgs:
if isinstance(pkgs, basestring):
@ -515,7 +514,7 @@ def uninstall(pkgs=None,
)
cmd.append('--timeout={0}'.format(timeout))
result = __salt__['cmd.run_all'](' '.join(cmd), runas=runas, cwd=cwd, env=__env__)
result = __salt__['cmd.run_all'](' '.join(cmd), runas=runas, cwd=cwd)
if treq and requirements.startswith('salt://'):
try:
@ -548,10 +547,10 @@ def freeze(bin_env=None,
salt '*' pip.freeze /home/code/path/to/virtualenv/
'''
pip_bin, __env__ = _get_pip_bin(bin_env)
cmd = '{0} freeze'.format(pip_bin)
result = __salt__['cmd.run_all'](cmd, runas=runas, cwd=cwd, env=__env__)
cmd = '{0} freeze'.format(_get_pip_bin(bin_env))
result = __salt__['cmd.run_all'](cmd, runas=runas, cwd=cwd)
if result['retcode'] > 0:
raise CommandExecutionError(result['stderr'])
@ -573,10 +572,9 @@ def list_(prefix='',
'''
packages = {}
pip_bin, __env__ = _get_pip_bin(bin_env)
cmd = '{0} freeze'.format(pip_bin)
cmd = '{0} freeze'.format(_get_pip_bin(bin_env))
result = __salt__['cmd.run_all'](cmd, runas=runas, cwd=cwd, env=__env__)
result = __salt__['cmd.run_all'](cmd, runas=runas, cwd=cwd)
if result['retcode'] > 0:
raise CommandExecutionError(result['stderr'])