Commit 82909179 by Michael DeHaan

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

Allow virtualenv_command argument of the pip module to be a pathname
parents 698b2fe9 d4d0753e
......@@ -65,8 +65,9 @@ options:
virtualenv_command:
version_aded: "1.1"
description:
- The command to create the virtual environment with. For example
C(pyvenv), C(virtualenv), C(virtualenv2).
- The command or a pathname to the command to create the virtual
environment with. For example C(pyvenv), C(virtualenv),
C(virtualenv2), C(~/bin/virtualenv), C(/usr/local/bin/virtualenv).
required: false
default: virtualenv
use_mirrors:
......@@ -193,7 +194,9 @@ def main():
if 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 module.check_mode:
module.exit_json(changed=True)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment