Browse code

Merge "Drop workaround for pip < 1.4"

Jenkins authored on 2014/10/04 18:25:47
Showing 3 changed files
... ...
@@ -21,17 +21,6 @@ function function_exists {
21 21
     declare -f -F $1 > /dev/null
22 22
 }
23 23
 
24
-
25
-# Cleanup anything from /tmp on unstack
26
-# clean_tmp
27
-function cleanup_tmp {
28
-    local tmp_dir=${TMPDIR:-/tmp}
29
-
30
-    # see comments in pip_install
31
-    sudo rm -rf ${tmp_dir}/pip-build.*
32
-}
33
-
34
-
35 24
 # Retrieve an image from a URL and upload into Glance.
36 25
 # Uses the following variables:
37 26
 #
... ...
@@ -1526,15 +1526,6 @@ function pip_install {
1526 1526
         pip_mirror_opt="--use-mirrors"
1527 1527
     fi
1528 1528
 
1529
-    # pip < 1.4 has a bug where it will use an already existing build
1530
-    # directory unconditionally.  Say an earlier component installs
1531
-    # foo v1.1; pip will have built foo's source in
1532
-    # /tmp/$USER-pip-build.  Even if a later component specifies foo <
1533
-    # 1.1, the existing extracted build will be used and cause
1534
-    # confusing errors.  By creating unique build directories we avoid
1535
-    # this problem. See https://github.com/pypa/pip/issues/709
1536
-    local pip_build_tmp=$(mktemp --tmpdir -d pip-build.XXXXX)
1537
-
1538 1529
     $xtrace
1539 1530
     $sudo_pip PIP_DOWNLOAD_CACHE=${PIP_DOWNLOAD_CACHE:-/var/cache/pip} \
1540 1531
         http_proxy=$http_proxy \
... ...
@@ -173,5 +173,3 @@ if [[ -n "$SCREEN" ]]; then
173 173
         screen -X -S $SESSION quit
174 174
     fi
175 175
 fi
176
-
177
-cleanup_tmp