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 #24789 from rallytime/bp-24717

Browse source 
Back-port #24717 to 2015.5
This commit is contained in:
Justin Findlay 2015-06-19 11:17:00 -06:00
commit 645e62a43c
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/modules/pip.py
View file

@ -737,7 +737,9 @@ def uninstall(pkgs=None,
The user under which to run pip
no_chown
When user is given, do not attempt to copy and chown
a requirements file
a requirements file (needed if the requirements file refers to other
files via relative paths, as the copy-and-chown procedure does not
account for such files)
cwd
Current working directory to run pip from
use_vt

7
salt/states/virtualenv_mod.py
View file

@ -58,6 +58,13 @@ def managed(name,
the file will be transferred from the master file server.
cwd
Path to the working directory where "pip install" is executed.
user
The user under which to run virtualenv and pip
no_chown: False
When user is given, do not attempt to copy and chown
a requirements file (needed if the requirements file refers to other
files via relative paths, as the copy-and-chown procedure does not
account for such files)
use_wheel : False
Prefer wheel archives (requires pip>=1.4)
no_deps: False