openstack/devstack
Code Issues Proposed changes

Merge "Resolve circular dependency when tracking dependencies."

Browse Source
This commit is contained in:
Jenkins 2014-08-02 02:09:09 +00:00 committed by Gerrit Code Review
commit d91cef35c6
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
functions-common
View File

@ -1349,7 +1349,10 @@ function pip_install {
if [[ -z "$os_PACKAGE" ]]; then if [[ -z "$os_PACKAGE" ]]; then
GetOSVersion GetOSVersion
fi fi
if [[ $TRACK_DEPENDS = True ]]; then if [[ $TRACK_DEPENDS = True && ! "$@" =~ virtualenv ]]; then
# TRACK_DEPENDS=True installation creates a circular dependency when
# we attempt to install virtualenv into a virualenv, so we must global
# that installation.
source $DEST/.venv/bin/activate source $DEST/.venv/bin/activate
local cmd_pip=$DEST/.venv/bin/pip local cmd_pip=$DEST/.venv/bin/pip
local sudo_pip="env" local sudo_pip="env"