commit d91cef35c605164d3fb960db992a5a7cae980431
author Jenkins <jenkins@review.openstack.org> Sat Aug 02 02:09:09 2014 +0000
committer Gerrit Code Review <review@openstack.org> Sat Aug 02 02:09:09 2014 +0000
tree a5537c3c7f1032ce82735c8eeb2aac98270c409f
parent bfc6631be8e59609fe3c9b6b19b800c9ff7574e5
parent 1229a0879f44cfd96be208fee8c56ed68c669576

Merge "Resolve circular dependency when tracking dependencies."

functions-common

diff --git a/functions-common b/functions-common
index 8d5197d..5284056 100644
--- a/functions-common
+++ b/functions-common
@@ -1349,7 +1349,10 @@
     if [[ -z "$os_PACKAGE" ]]; then
         GetOSVersion
     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
         local cmd_pip=$DEST/.venv/bin/pip
         local sudo_pip="env"