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

Fixes #30569

Browse source
This commit is contained in:
Jacob Ward 2016-01-23 16:47:40 -07:00
parent 8823d7f56a
commit 40d9e6f505
4 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
doc/man/salt.7
View file

@ -112692,7 +112692,7 @@ Activates the virtual environment, if given via bin_env,
before running install.
.sp
Deprecated since version 2014.7.2: If \fIbin_env\fP is given, pip will already be sourced from that
virualenv, making \fIactivate\fP effectively a noop.
virtualenv, making \fIactivate\fP effectively a noop.
.TP
.B pre_releases
@ -112714,7 +112714,7 @@ Allow the installation of insecure and unverifiable files (comma separated list)
Enable the processing of dependency links
.TP
.B use_vt
Use VT terminal emulation (see ouptut while installing)
Use VT terminal emulation (see output while installing)
.TP
.B env_vars
Set environment variables that some builds will depend on. For example,
@ -112837,7 +112837,7 @@ account for such files)
Current working directory to run pip from
.TP
.B use_vt
Use VT terminal emulation (see ouptut while installing)
Use VT terminal emulation (see output while installing)
.UNINDENT
.sp
CLI Example:
@ -136259,7 +136259,7 @@ None
Set ownership for the virtualenv
.TP
.B use_vt
Use VT terminal emulation (see ouptut while installing)
Use VT terminal emulation (see output while installing)
.UNINDENT
.sp
\fBNOTE:\fP
@ -183682,7 +183682,7 @@ Activates the virtual environment, if given via bin_env,
before running install.
.sp
Deprecated since version 2014.7.2: If \fIbin_env\fP is given, pip will already be sourced from that
virualenv, making \fIactivate\fP effectively a noop.
virtualenv, making \fIactivate\fP effectively a noop.
.TP
.B pre_releases
@ -183715,7 +183715,7 @@ such as specifying INCLUDE or LIBRARY paths in Makefiles, build scripts or
compiler calls.
.TP
.B use_vt
Use VT terminal emulation (see ouptut while installing)
Use VT terminal emulation (see output while installing)
.TP
.B trusted_host
Mark this host as trusted, even though it does not have valid or any
@ -183870,7 +183870,7 @@ None
the pip executable or virtualenenv to use
.TP
.B use_vt
Use VT terminal emulation (see ouptut while installing)
Use VT terminal emulation (see output while installing)
.UNINDENT
.UNINDENT
.INDENT 0.0
@ -183893,7 +183893,7 @@ The user under which to run pip
the pip executable or virtualenenv to use
.TP
.B use_vt
Use VT terminal emulation (see ouptut while installing)
Use VT terminal emulation (see output while installing)
.UNINDENT
.UNINDENT
.SS salt.states.pkg

6
salt/modules/pip.py
View file

@ -498,7 +498,7 @@ def install(pkgs=None, # pylint: disable=R0912,R0913,R0914
.. deprecated:: 2014.7.2
If `bin_env` is given, pip will already be sourced from that
virualenv, making `activate` effectively a noop.
virtualenv, making `activate` effectively a noop.
pre_releases
Include pre-releases in the available versions
@ -537,7 +537,7 @@ def install(pkgs=None, # pylint: disable=R0912,R0913,R0914
HTTPS.
use_vt
Use VT terminal emulation (see ouptut while installing)
Use VT terminal emulation (see output while installing)
CLI Example:
@ -895,7 +895,7 @@ def uninstall(pkgs=None,
cwd
Current working directory to run pip from
use_vt
Use VT terminal emulation (see ouptut while installing)
Use VT terminal emulation (see output while installing)
CLI Example:

2
salt/modules/virtualenv_mod.py
View file

@ -108,7 +108,7 @@ def create(path,
``user`` should be used instead
use_vt : False
Use VT terminal emulation (see ouptut while installing)
Use VT terminal emulation (see output while installing)
.. versionadded:: 2015.5.0

8
salt/states/pip_state.py
View file

@ -377,7 +377,7 @@ def installed(name,
.. deprecated:: 2014.7.2
If `bin_env` is given, pip will already be sourced from that
virualenv, making `activate` effectively a noop.
virtualenv, making `activate` effectively a noop.
pre_releases
Include pre-releases in the available versions
@ -419,7 +419,7 @@ def installed(name,
VERBOSE: True
use_vt
Use VT terminal emulation (see ouptut while installing)
Use VT terminal emulation (see output while installing)
trusted_host
Mark this host as trusted, even though it does not have valid or any
@ -833,7 +833,7 @@ def removed(name,
bin_env : None
the pip executable or virtualenenv to use
use_vt
Use VT terminal emulation (see ouptut while installing)
Use VT terminal emulation (see output while installing)
'''
ret = {'name': name, 'result': None, 'comment': '', 'changes': {}}
@ -890,7 +890,7 @@ def uptodate(name,
bin_env
the pip executable or virtualenenv to use
use_vt
Use VT terminal emulation (see ouptut while installing)
Use VT terminal emulation (see output while installing)
'''
ret = {'name': name,
'changes': {},