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

Merge "pip-and-virtualenv : only remove system files on centos"

Browse Source
This commit is contained in:
Zuul 2019-02-02 01:38:48 +00:00 committed by Gerrit Code Review
commit 46ac931513
1 changed files with 36 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,15 +59,28 @@ if [[ $DISTRO_NAME =~ (opensuse|fedora|centos|centos7|rhel7) ]]; then
${YUM:-yum} ${_extra_repo} install -y $packages ${YUM:-yum} ${_extra_repo} install -y $packages
fi fi
# pip10 (unlike earlier versions) will not uninstall distutils # pip10 onwards (unlike earlier versions) will not uninstall
# installed packages (note this is only a subset of packages that # packages installed by distutils (note this is only a subset of
# don't use setuptools for various reasons). We give it a little # packages that don't use setuptools for various reasons; the
# help by clearing out the files from the packages we are about to # problem is essentially they do not include a manifest of files
# re-install so pip doesn't think anything is installed. See: # in the package to delete, so pip was just guessing). We give it
# https://github.com/pypa/pip/issues/4805 # a little help by clearing out the files from the packages we are
for pkg in $packages; do # about to re-install so pip doesn't think anything is installed.
rpm -ql $pkg | xargs rm -rf # See: https://github.com/pypa/pip/issues/4805
done #
# This is only necessary on CentOS -- for complicated reasons of
# course. On Fedora, the Python2 virtualenv packages are *not*
# distutils based and pip overwrites them correctly. For python3,
# pip has changed to not overwrite system packages (a long
# standing difference between Debuntu and Fedora), but a number of
# 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
for pkg in $packages; do
rpm -ql $pkg | xargs rm -rf
done
fi
# install the latest python2 pip; this overwrites packaged pip # install the latest python2 pip; this overwrites packaged pip
python /tmp/get-pip.py ${pip_args} python /tmp/get-pip.py ${pip_args}
@ -99,6 +112,20 @@ if [[ $DISTRO_NAME =~ (opensuse|fedora|centos|centos7|rhel7) ]]; then
# call it explicitly. # call it explicitly.
ln -sf /usr/bin/pip2 /usr/bin/pip ln -sf /usr/bin/pip2 /usr/bin/pip
rm -f /usr/local/bin/pip rm -f /usr/local/bin/pip
# So on Fedora, there are now supposed to be two versions of
# python3 setuptools installed; the one installed by pip in
# /usr/local and the one installed by the system
# python3-setuptools rpm package in /usr/local. The idea is
# that packaged python tools use the "system" python (with -Es
# flag) and are isolated from pip installs ... except there is
# an issue where pip clears out the RPM version files before
# installing it's isolated version:
# https://bugzilla.redhat.com/show_bug.cgi?id=1550368
#
# Thus we need to *reinstall* the RPM version now, so those
# files come back and system tools continue to work
dnf reinstall -y python3-setuptools
fi fi
# now install latest virtualenv. it vendors stuff it needs so # now install latest virtualenv. it vendors stuff it needs so