Merge pull request #4786 from SalesSeek/find-correct-easy-install

Fix determination of correct, possibly customized, 'easy_install' executable
reviewable/pr18780/r1
jctanner 11 years ago
commit d0581d1c4d

@ -133,7 +133,6 @@ def main():
name = module.params['name'] name = module.params['name']
env = module.params['virtualenv'] env = module.params['virtualenv']
easy_install = module.get_bin_path(module.params['executable'], True, ['%s/bin' % env])
executable = module.params['executable'] executable = module.params['executable']
easy_install = _get_easy_install(module, env, executable) easy_install = _get_easy_install(module, env, executable)
site_packages = module.params['virtualenv_site_packages'] site_packages = module.params['virtualenv_site_packages']
@ -158,8 +157,6 @@ def main():
out += out_venv out += out_venv
err += err_venv err += err_venv
easy_install = module.get_bin_path('easy_install', True, ['%s/bin' % env])
cmd = None cmd = None
changed = False changed = False
installed = _is_package_installed(module, name, easy_install) installed = _is_package_installed(module, name, easy_install)

Loading…
Cancel
Save