openstack
/
diskimage-builder
Code Issues Proposed changes

Merge "pip-and-virtualenv: handle centos image-based builds"

This commit is contained in:
Zuul 2019-02-07 07:54:23 +00:00 committed by Gerrit Code Review
parent dd8bbd5c4f d0906ad473
commit 25ba034a0e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
diskimage_builder/elements/pip-and-virtualenv/install.d/pip-and-virtualenv-source-install/04-install-pip
View File

@ -76,7 +76,7 @@ if [[ $DISTRO_NAME =~ (opensuse|fedora|centos|centos7|rhel7) ]]; then
# tools run with "python3 -Es" to isolate themselves to the
# package installed versions. So we definitely don't want to
# clear the packaged versions out in that case.
if [[ $DISTRO_NAME == "centos" ]]; then
if [[ $DISTRO_NAME =~ (centos|centos7|rhel7) ]]; then
for pkg in $packages; do
rpm -ql $pkg | xargs rm -rf
done