Commit 8223d3ee by Lorin Hochstein

Retrieve pip path after creating virtualenv

Retrieve the pip path after creating a non-existent virtualenv.
Prevents the problem of using the wrong pip if virtualenv doesn't
exist yet.
parent fe923b93
......@@ -101,7 +101,6 @@ def main():
out = ''
env = module.params['virtualenv']
pip = _find_pip(module, env)
if env:
virtualenv = _find_virtualenv(module)
......@@ -112,6 +111,8 @@ def main():
out += out_venv
err += err_venv
pip = _find_pip(module, env)
state = module.params['state']
name = module.params['name']
version = module.params['version']
......@@ -154,15 +155,15 @@ def main():
changed = 'Successfully installed' in out_pip
elif name:
installed = _is_package_installed(name, pip, version)
changed = ((installed and state == 'absent') or
(not installed and state == 'present'))
if changed:
if state == 'present':
full_name = _get_full_name(name, version)
else:
full_name = _get_full_name(name, version)
else:
full_name = name
cmd = '%s %s %s' % (pip, command_map[state], full_name)
......
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