From 6ec66bb3d1354062ec70be972dba990e886084d5 Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Mon, 22 Dec 2014 17:17:51 +0000 Subject: [PATCH] Install prettytable>=0.7 to satisfy pip 6/PEP 440 Also use sudo -H with pip so that it doesn't create a ~stack/.cache other things can't write to as the stack user later. Change-Id: I2134c7d8f58f8b83f33150c9ed86d87f8ccba2f3 --- functions-common | 2 +- tools/fixup_stuff.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/functions-common b/functions-common index 94ab34763e..40a0d2b942 100644 --- a/functions-common +++ b/functions-common @@ -1578,7 +1578,7 @@ function pip_install { local sudo_pip="env" else local cmd_pip=$(get_pip_command) - local sudo_pip="sudo" + local sudo_pip="sudo -H" fi $xtrace diff --git a/tools/fixup_stuff.sh b/tools/fixup_stuff.sh index ca465339b7..26aae82535 100755 --- a/tools/fixup_stuff.sh +++ b/tools/fixup_stuff.sh @@ -85,7 +85,7 @@ function get_package_path { # Fix prettytable 0.7.2 permissions # Don't specify --upgrade so we use the existing package if present -pip_install 'prettytable>0.7' +pip_install 'prettytable>=0.7' PACKAGE_DIR=$(get_package_path prettytable) # Only fix version 0.7.2 dir=$(echo $PACKAGE_DIR/prettytable-0.7.2*)