Browse code

Remove fixup_python_packages

The hack has be around for pip 1.4.1 and older. It should be safe to
remove it by now. In fact it causes problems in my Ubutu Bionic VM when
trying to overwrite httplib2 library installed from the distro package.

Change-Id: I34b826f4e8f10f8d44b888120f19fcc7ba501b3d

Witek Bedyk authored on 2020/01/25 02:52:25
Showing 1 changed files
... ...
@@ -5,16 +5,6 @@
5 5
 # fixup_stuff.sh
6 6
 #
7 7
 # All distro and package specific hacks go in here
8
-#
9
-# - prettytable 0.7.2 permissions are 600 in the package and
10
-#   pip 1.4 doesn't fix it (1.3 did)
11
-#
12
-# - httplib2 0.8 permissions are 600 in the package and
13
-#   pip 1.4 doesn't fix it (1.3 did)
14
-#
15
-# - Fedora:
16
-#   - set selinux not enforcing
17
-#   - uninstall firewalld (f20 only)
18 8
 
19 9
 
20 10
 # If ``TOP_DIR`` is set we're being sourced rather than running stand-alone
... ...
@@ -101,32 +91,6 @@ function get_package_path {
101 101
     echo $(python -c "import os; import $package; print(os.path.split(os.path.realpath($package.__file__))[0])")
102 102
 }
103 103
 
104
-
105
-# Pre-install affected packages so we can fix the permissions
106
-# These can go away once we are confident that pip 1.4.1+ is available everywhere
107
-
108
-function fixup_python_packages {
109
-    # Fix prettytable 0.7.2 permissions
110
-    # Don't specify --upgrade so we use the existing package if present
111
-    pip_install 'prettytable>=0.7'
112
-    PACKAGE_DIR=$(get_package_path prettytable)
113
-    # Only fix version 0.7.2
114
-    dir=$(echo $PACKAGE_DIR/prettytable-0.7.2*)
115
-    if [[ -d $dir ]]; then
116
-        sudo chmod +r $dir/*
117
-    fi
118
-
119
-    # Fix httplib2 0.8 permissions
120
-    # Don't specify --upgrade so we use the existing package if present
121
-    pip_install httplib2
122
-    PACKAGE_DIR=$(get_package_path httplib2)
123
-    # Only fix version 0.8
124
-    dir=$(echo $PACKAGE_DIR-0.8*)
125
-    if [[ -d $dir ]]; then
126
-        sudo chmod +r $dir/*
127
-    fi
128
-}
129
-
130 104
 function fixup_fedora {
131 105
     if ! is_fedora; then
132 106
         return
... ...
@@ -268,7 +232,6 @@ function fixup_virtualenv {
268 268
 function fixup_all {
269 269
     fixup_keystone
270 270
     fixup_ubuntu
271
-    fixup_python_packages
272 271
     fixup_fedora
273 272
     fixup_suse
274 273
     fixup_virtualenv