Browse code

Merge "Fix TRACKING_DEPENDS mode"

Jenkins authored on 2015/01/16 09:22:15
Showing 1 changed files
... ...
@@ -711,6 +711,19 @@ if [[ "$OFFLINE" != "True" ]]; then
711 711
     PYPI_ALTERNATIVE_URL=$PYPI_ALTERNATIVE_URL $TOP_DIR/tools/install_pip.sh
712 712
 fi
713 713
 
714
+TRACK_DEPENDS=${TRACK_DEPENDS:-False}
715
+
716
+# Install python packages into a virtualenv so that we can track them
717
+if [[ $TRACK_DEPENDS = True ]]; then
718
+    echo_summary "Installing Python packages into a virtualenv $DEST/.venv"
719
+    pip_install -U virtualenv
720
+
721
+    rm -rf $DEST/.venv
722
+    virtualenv --system-site-packages $DEST/.venv
723
+    source $DEST/.venv/bin/activate
724
+    $DEST/.venv/bin/pip freeze > $DEST/requires-pre-pip
725
+fi
726
+
714 727
 # Do the ugly hacks for broken packages and distros
715 728
 source $TOP_DIR/tools/fixup_stuff.sh
716 729
 
... ...
@@ -731,19 +744,6 @@ if is_service_enabled neutron; then
731 731
     install_neutron_agent_packages
732 732
 fi
733 733
 
734
-TRACK_DEPENDS=${TRACK_DEPENDS:-False}
735
-
736
-# Install python packages into a virtualenv so that we can track them
737
-if [[ $TRACK_DEPENDS = True ]]; then
738
-    echo_summary "Installing Python packages into a virtualenv $DEST/.venv"
739
-    pip_install -U virtualenv
740
-
741
-    rm -rf $DEST/.venv
742
-    virtualenv --system-site-packages $DEST/.venv
743
-    source $DEST/.venv/bin/activate
744
-    $DEST/.venv/bin/pip freeze > $DEST/requires-pre-pip
745
-fi
746
-
747 734
 # Check Out and Install Source
748 735
 # ----------------------------
749 736