summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Riedemann <mriedem@us.ibm.com>2015-06-08 12:31:13 -0700
committerMatt Riedemann <mriedem@us.ibm.com>2015-06-08 12:31:13 -0700
commitea32a648e486a9f5a90d8083f06721577d28a3da (patch)
tree6928108ea6244f8e5d358b4ff31bf0e82a083497
parente842c13fa509f67abb9b364438ff255ad4b721ed (diff)
Call sudo with -H in pip_installicehouse-eol
Commit 7aa7699acb764fd73322f8926eb5e967d71e25b0 was an incomplete cherry pick since it missed the part that added -H to sudo pip install. This is similar to what was added in change If791b9b25d6a4280dab19117004184e57e78d038. This is needed on stable/icehouse only since the change was made in Kilo originally and backported to stable/juno. This should fix grenade against stable/juno changes where the 'old' side is stable/icehouse. Change-Id: Ia52823ec2e322f78d407993010eb04adf39a242c Closes-Bug: #1463149
Notes
Notes (review): Verified+2: Jenkins Code-Review+2: Dean Troyer <dtroyer@gmail.com> Code-Review+2: Ian Wienand <iwienand@redhat.com> Workflow+1: Ian Wienand <iwienand@redhat.com> Submitted-by: Jenkins Submitted-at: Tue, 09 Jun 2015 03:06:38 +0000 Reviewed-on: https://review.openstack.org/189413 Project: openstack-dev/devstack Branch: refs/heads/stable/icehouse
-rw-r--r--functions-common2
1 files changed, 1 insertions, 1 deletions
diff --git a/functions-common b/functions-common
index a4a0818..304eed8 100644
--- a/functions-common
+++ b/functions-common
@@ -1356,7 +1356,7 @@ function pip_install {
1356 CMD_PIP=$DEST/.venv/bin/pip 1356 CMD_PIP=$DEST/.venv/bin/pip
1357 SUDO_PIP="env" 1357 SUDO_PIP="env"
1358 else 1358 else
1359 SUDO_PIP="sudo" 1359 SUDO_PIP="sudo -H"
1360 CMD_PIP=$(get_pip_command) 1360 CMD_PIP=$(get_pip_command)
1361 fi 1361 fi
1362 1362