Browse code

Merge "Resolve circular dependency when tracking dependencies."

Jenkins authored on 2014/08/02 11:09:09
Showing 1 changed files
... ...
@@ -1349,7 +1349,10 @@ function pip_install {
1349 1349
     if [[ -z "$os_PACKAGE" ]]; then
1350 1350
         GetOSVersion
1351 1351
     fi
1352
-    if [[ $TRACK_DEPENDS = True ]]; then
1352
+    if [[ $TRACK_DEPENDS = True && ! "$@" =~ virtualenv ]]; then
1353
+        # TRACK_DEPENDS=True installation creates a circular dependency when
1354
+        # we attempt to install virtualenv into a virualenv, so we must global
1355
+        # that installation.
1353 1356
         source $DEST/.venv/bin/activate
1354 1357
         local cmd_pip=$DEST/.venv/bin/pip
1355 1358
         local sudo_pip="env"