Ensure virtualenv is not broken for CentOS/SuSE too
In I2c50bb693dc5dc505bddce34ff45294ac44f7dc9 we applied changes to the settings to repo_build_venv_command_options so that pip, setuptools and wheel were not copied into the new virtualend on creation, but rather installed into it later. Unfortunately the patch missed that CentOS and SuSE platforms have an override for the same variable, so the issue set out in the patch still applies to those platforms. This patch ensures that the overrides are removed and the variable is only declared in one place, but the same functionality which gave rise to the override for those platforms is still applied when executed. Closes-Bug: #1746935 Change-Id: Ie0c8c95a0d4315f8d1f848b1309bf88b7c2644d4
This commit is contained in:
parent
778ceee2cf
commit
d206e7a61b
|
@ -102,9 +102,12 @@ repo_build_venv_pip_install_options: >-
|
|||
# without them and use get-pip.py later to install them
|
||||
# into the venv. This prevents messy upgrade/downgrade
|
||||
# failures when trying to install the versions we want.
|
||||
# NOTE(odyssey4me):
|
||||
# Not using --always-copy for CentOS/SuSE due to
|
||||
# https://github.com/pypa/virtualenv/issues/565
|
||||
repo_build_venv_command_options: >-
|
||||
{{ virtualenv_bin }}
|
||||
--always-copy
|
||||
{{ (ansible_pkg_mgr == 'apt') | ternary('--always-copy', '') }}
|
||||
--no-pip
|
||||
--no-setuptools
|
||||
--no-wheel
|
||||
|
|
|
@ -36,9 +36,3 @@ repo_build_distro_packages:
|
|||
- swig
|
||||
- which
|
||||
- tar # required for /opt/op-venv-script.sh
|
||||
|
||||
# workaround for https://github.com/pypa/virtualenv/issues/565
|
||||
repo_build_venv_command_options: >
|
||||
{{ virtualenv_bin }}
|
||||
--extra-search-dir {{ repo_build_release_path }}
|
||||
--never-download
|
||||
|
|
|
@ -39,9 +39,3 @@ repo_build_distro_packages:
|
|||
- swig
|
||||
- which
|
||||
- tar # required for /opt/op-venv-script.sh
|
||||
|
||||
# workaround for https://github.com/pypa/virtualenv/issues/565
|
||||
repo_build_venv_command_options: >
|
||||
{{ virtualenv_bin }}
|
||||
--extra-search-dir {{ repo_build_release_path }}
|
||||
--never-download
|
||||
|
|
Loading…
Reference in New Issue