wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2976 from stoned/pip-virtualenv_command-pathname

Browse source 
Allow virtualenv_command argument of the pip module to be a pathname
This commit is contained in:
Michael DeHaan 2013-05-24 20:01:12 -07:00
commit 82909179a0
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
library/packaging/pip
View file

@ -65,8 +65,9 @@ options:
virtualenv_command: virtualenv_command:
version_aded: "1.1" version_aded: "1.1"
description: description:
- The command to create the virtual environment with. For example - The command or a pathname to the command to create the virtual
C(pyvenv), C(virtualenv), C(virtualenv2). environment with. For example C(pyvenv), C(virtualenv),
C(virtualenv2), C(~/bin/virtualenv), C(/usr/local/bin/virtualenv).
required: false required: false
default: virtualenv default: virtualenv
use_mirrors: use_mirrors:
@ -193,7 +194,9 @@ def main():
if env: if env:
env = os.path.expanduser(env) env = os.path.expanduser(env)
virtualenv = module.get_bin_path(virtualenv_command, True) virtualenv = os.path.expanduser(virtualenv_command)
if os.path.basename(virtualenv) == virtualenv:
virtualenv = module.get_bin_path(virtualenv_command, True)
if not os.path.exists(os.path.join(env, 'bin', 'activate')): if not os.path.exists(os.path.join(env, 'bin', 'activate')):
if module.check_mode: if module.check_mode:
module.exit_json(changed=True) module.exit_json(changed=True)