Merge ~pwlars/checkbox/+git/support:more-pmr-fixes into ~checkbox-dev/checkbox/+git/support:master

[Paul Larson]

I've created the closest thing I can to a test environment for this, and used this, plus my other changes at https://github.com/checkbox/external-tarballs/pull/6/files to test the following projects:

checkbox-ng
plainbox
plainbox-provider-snappy
plainbox-provider-plano

These changes resolve the corner cases that some of these seemed to be having on trusty, and most importantly, the ones related to proxy access and older versions of urllib3/pip/requests

I *think* this should work for hwcert now, but it's hard to know for sure if there's still some other corner case out there.

[Sylvain Pineau (sylvain-pineau)]

+1

review: Approve

diff --git a/get-external-tarballs b/get-external-tarballs
index 80cb583..4a1fb93 100755
--- a/get-external-tarballs
+++ b/get-external-tarballs
@@ -27,7 +27,7 @@ if [ "$CHECKBOX_TOP" = "" ]; then
     exit 100
 fi
 
-# Ensure that we have git 
+# Ensure that we have git
 if [ "$(which git)" = "" ]; then
     echo "E: you need to have git installed first"
     exit 101
@@ -47,9 +47,3 @@ cd $CHECKBOX_TOP/support/external-tarballs
 if ! git fetch origin --quiet; then
     echo "W: cannot perform fetch, external-tarballs may be out of date"
 fi
-
-# Ensure that we are on the correct revision
-if ! git checkout $(cat $CHECKBOX_TOP/support/external-tarballs-revision.txt); then
-    echo "E: cannot switch to required commit!"
-    exit 1
-fi
diff --git a/install-pip-from-source b/install-pip-from-source
index 9f631d7..0b1c00f 100755
--- a/install-pip-from-source
+++ b/install-pip-from-source
@@ -31,7 +31,7 @@ fi
 if [ ! -d "$CHECKBOX_TOP/support/external-tarballs" ]; then
     echo "E: you need to have $CHECKBOX_TOP/support/external-tarballs to run this script"
     echo "I: git clone https://github.com/checkbox/external-tarballs $CHECKBOX_TOP/support/external-tarballs"
-    exit 101 
+    exit 101
 fi
 
 # Ensure that we have python3
@@ -45,7 +45,7 @@ build_dir=$(mktemp -d)
 trap "rm -rf \"$build_dir\"" EXIT
 
 # Unpack pip source
-tar zxf $CHECKBOX_TOP/support/external-tarballs/pypi/pip-1.3.1.tar.gz -C "$build_dir"
+tar zxf $CHECKBOX_TOP/support/external-tarballs/pypi/pip-9.0.1.tar.gz -C "$build_dir"
 
 # Set a http_proxy to the local discard port to prevent setuptools from
 # downloading anything.
@@ -53,4 +53,4 @@ export http_proxy=http://127.0.0.1:9
 
 # Install it
 echo "I: installing pip from source"
-cd "$build_dir/pip-1.3.1/" && python3 setup.py install --quiet --quiet
+cd "$build_dir/pip-9.0.1/" && python3 setup.py install --quiet --quiet