sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
This fixes a regression in I041a141366099093805e6052b1bbf64efd277e1e
where we starting skipping the removal of old files for image-based
builds (confusingly named centos7 rather than centos for historical
reasons).  Fix the check

Change-Id: I74688a9e91d833b5d654056431729bed0585616c
This commit is contained in:
Ian Wienand 2019-02-07 10:56:29 +11:00
parent 46ac931513
commit d0906ad473
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 # tools run with "python3 -Es" to isolate themselves to the
# package installed versions. So we definitely don't want to # package installed versions. So we definitely don't want to
# clear the packaged versions out in that case. # 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 for pkg in $packages; do
rpm -ql $pkg | xargs rm -rf rpm -ql $pkg | xargs rm -rf
done done