mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
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.
This commit is contained in:
parent
fe923b9394
commit
8223d3ee3f
1 changed files with 5 additions and 4 deletions
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue