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

Fixed unnecessary API changes introduced with suggested changes.

Browse source
This commit is contained in:
zer0def 2017-03-28 10:45:04 +02:00
parent 7976840100
commit 9d0f94eeba
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/modules/pip.py
View file

@ -344,7 +344,6 @@ def install(pkgs=None, # pylint: disable=R0912,R0913,R0914
target=None,
download=None,
download_cache=None,
cache_dir=None,
source=None,
upgrade=False,
force_reinstall=False,
@ -368,7 +367,8 @@ def install(pkgs=None, # pylint: disable=R0912,R0913,R0914
env_vars=None,
use_vt=False,
trusted_host=None,
no_cache_dir=False):
no_cache_dir=False,
cache_dir=None):
'''
Install packages with pip

4
salt/states/pip_state.py
View file

@ -237,7 +237,6 @@ def installed(name,
target=None,
download=None,
download_cache=None,
cache_dir=None,
source=None,
upgrade=False,
force_reinstall=False,
@ -260,7 +259,8 @@ def installed(name,
env_vars=None,
use_vt=False,
trusted_host=None,
no_cache_dir=False):
no_cache_dir=False,
cache_dir=None):
'''
Make sure the package is installed

8
salt/states/virtualenv_mod.py
View file

@ -47,7 +47,6 @@ def managed(name,
no_deps=False,
pip_download=None,
pip_download_cache=None,
pip_cache_dir=None,
pip_exists_action=None,
pip_ignore_installed=False,
proxy=None,
@ -56,7 +55,8 @@ def managed(name,
no_use_wheel=False,
pip_upgrade=False,
pip_pkgs=None,
pip_no_cache_dir=False):
pip_no_cache_dir=False,
pip_cache_dir=None):
'''
Create a virtualenv and optionally manage it with pip
@ -272,7 +272,6 @@ def managed(name,
extra_index_url=extra_index_url,
download=pip_download,
download_cache=pip_download_cache,
cache_dir=pip_cache_dir,
no_chown=no_chown,
pre_releases=pre_releases,
exists_action=pip_exists_action,
@ -282,7 +281,8 @@ def managed(name,
proxy=proxy,
use_vt=use_vt,
env_vars=env_vars,
no_cache_dir=pip_no_cache_dir
no_cache_dir=pip_no_cache_dir,
cache_dir=pip_cache_dir
)
ret['result'] &= _ret['retcode'] == 0
if _ret['retcode'] > 0: