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

Merge pull request #5383 from janitha/devel

Browse source 
Fixes #5381 bug when easy_install is used with virtualenv
This commit is contained in:
jctanner 2014-01-14 08:52:12 -08:00
commit e4d0ce5b08
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
library/packaging/easy_install
View file

@ -135,7 +135,6 @@ def main():
name = module.params['name'] name = module.params['name']
env = module.params['virtualenv'] env = module.params['virtualenv']
executable = module.params['executable'] executable = module.params['executable']
easy_install = _get_easy_install(module, env, executable)
site_packages = module.params['virtualenv_site_packages'] site_packages = module.params['virtualenv_site_packages']
virtualenv_command = module.params['virtualenv_command'] virtualenv_command = module.params['virtualenv_command']
@ -159,6 +158,8 @@ def main():
out += out_venv out += out_venv
err += err_venv err += err_venv
easy_install = _get_easy_install(module, env, executable)
cmd = None cmd = None
changed = False changed = False
installed = _is_package_installed(module, name, easy_install) installed = _is_package_installed(module, name, easy_install)