From 7272afdf8bf55580f778530d590afd505394b4ae Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Wed, 10 Jun 2015 10:26:57 +0000 Subject: [PATCH] Revert "Replace pip-installed requests CA bundle with link" This does not gracefully handle the situation where requests is not there at the beginning. Needs to be rethought. This reverts commit 7d350720fe5d25fece68c5d1625a33a6cad431ef. Change-Id: I101fac0dc6fdc97b7fb0b2955cffc6b4905152e5 --- tools/fixup_stuff.sh | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/tools/fixup_stuff.sh b/tools/fixup_stuff.sh index d3a3de2092..31258d13f7 100755 --- a/tools/fixup_stuff.sh +++ b/tools/fixup_stuff.sh @@ -138,24 +138,3 @@ fi # and installing the latest version using pip. uninstall_package python-virtualenv pip_install -U virtualenv - -# If a non-system python-requests is installed then it will use the -# built-in CA certificate store rather than the distro-specific -# CA certificate store. Detect this and symlink to the correct -# one. If the value for the CA is not rooted in /etc then we know -# we need to change it. -capath=$(python -c "from requests import certs; print certs.where()") - -if is_service_enabled tls-proxy || [ "$USE_SSL" == "True" ]; then - if [[ ! $capath =~ ^/etc/.* && ! -L $capath ]]; then - if is_fedora; then - sudo rm -f $capath - sudo ln -s /etc/pki/tls/certs/ca-bundle.crt $capath - elif is_ubuntu; then - sudo rm -f $capath - sudo ln -s /etc/ssl/certs/ca-certificates.crt $capath - else - echo "Don't know how to set the CA bundle, expect the install to fail." - fi - fi -fi