cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #3074 from stefano-m/devel

Browse source 
Make 'executable' and 'virtualenv' mutually exclusive
This commit is contained in:
Brian Coca 2016-03-03 18:36:52 -05:00
commit e4c4f02472
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
packaging/language/pip.py
View file

@ -51,7 +51,8 @@ options:
default: null default: null
virtualenv: virtualenv:
description: description:
- An optional path to a I(virtualenv) directory to install into - An optional path to a I(virtualenv) directory to install into.
It cannot be specified together with the 'executable' parameter (added in 2.1).
required: false required: false
default: null default: null
virtualenv_site_packages: virtualenv_site_packages:
@ -112,6 +113,7 @@ options:
run pip for a specific version of Python installed in the system. For run pip for a specific version of Python installed in the system. For
example C(pip-3.3), if there are both Python 2.7 and 3.3 installations example C(pip-3.3), if there are both Python 2.7 and 3.3 installations
in the system and you want to run pip for the Python 3.3 installation. in the system and you want to run pip for the Python 3.3 installation.
It cannot be specified together with the 'virtualenv' parameter (added in 2.1).
version_added: "1.3" version_added: "1.3"
required: false required: false
default: null default: null
@ -277,7 +279,7 @@ def main():
umask=dict(reqiured=False,default=None), umask=dict(reqiured=False,default=None),
), ),
required_one_of=[['name', 'requirements']], required_one_of=[['name', 'requirements']],
mutually_exclusive=[['name', 'requirements']], mutually_exclusive=[['name', 'requirements'], ['executable', 'virtualenv']],
supports_check_mode=True supports_check_mode=True
) )