openstack/devstack
Code Issues Proposed changes

Use the pip installed version of requests with Fedora

Browse Source 
The upstream version of requests contains a copy
of urllib3 and cardet library, common practice in many distros
to create symbolic links for these libraries instead of creating
a huge package which contains the same library as the distro provides
as separate package as well.

Now devstack upgrades the urllib3 to incompatible version,
but it leaves the requests unchanged because Fedora already has the
latest version.
The issue does not happens with Ubuntu because it has older requests
and devstack updates it as well.
The pip installed version contains a bundled urllib3 and the actually
installed urllib3 version does not matters.

This is not the `usual` distro package overrides pip installed package
case.

Change-Id: Icfa71368384b0c2e3ff39265b2fa9190b5566b9b
Related-Bug: #1476770
This commit is contained in:
Attila Fazekas 2015-09-01 15:18:57 +02:00 committed by Ian Wienand
parent f560df36cc
commit c7e772c164
1 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
tools/fixup_stuff.sh
View File

@ -134,6 +134,31 @@ if is_fedora; then
sudo systemctl start iptables sudo systemctl start iptables
fi fi
fi fi
if [[ "$os_RELEASE" -ge "21" ]]; then
# requests ships vendored version of chardet/urllib3, but on
# fedora these are symlinked back to the primary versions to
# avoid duplication of code on disk. This is fine when
# maintainers keep things in sync, but since devstack takes
# over and installs later versions via pip we can end up with
# incompatible versions.
#
# The rpm package is not removed to preserve the dependent
# packages like cloud-init; rather we remove the symlinks and
# force a re-install of requests so the vendored versions it
# wants are present.
#
# Realted issues:
# https://bugs.launchpad.net/glance/+bug/1476770
# https://bugzilla.redhat.com/show_bug.cgi?id=1253823
base_path=/usr/lib/python2.7/site-packages/requests/packages
if [ -L $base_path/chardet -o -L $base_path/urllib3 ]; then
sudo rm -f /usr/lib/python2.7/site-packages/requests/packages/{chardet,urllib3}
# install requests with the bundled urllib3 to avoid conflicts
pip_install --upgrade --force-reinstall requests
fi
fi
fi fi
# The version of pip(1.5.4) supported by python-virtualenv(1.11.4) has # The version of pip(1.5.4) supported by python-virtualenv(1.11.4) has