Remove code tagged as "can be removed after Icehouse"

Change-Id: Ib78f3d55c9dcd46e0dfc3343c32e077cf530b5f7
This commit is contained in:
Christian Berendt 2014-08-04 14:29:55 +02:00
parent 735f4d340f
commit 21cb67c1e5

View File

@ -35,10 +35,6 @@ PECAN_DIR=$DEST/pecan
# install_stackforge() - Collect source and prepare # install_stackforge() - Collect source and prepare
function install_stackforge { function install_stackforge {
# TODO(sdague): remove this once we get to Icehouse, this just makes
# for a smoother transition of existing users.
cleanup_stackforge
git_clone $WSME_REPO $WSME_DIR $WSME_BRANCH git_clone $WSME_REPO $WSME_DIR $WSME_BRANCH
setup_package $WSME_DIR setup_package $WSME_DIR
@ -46,20 +42,6 @@ function install_stackforge {
setup_package $PECAN_DIR setup_package $PECAN_DIR
} }
# cleanup_stackforge() - purge possibly old versions of stackforge libraries
function cleanup_stackforge {
# this means we've got an old version installed, lets get rid of it
# otherwise python hates itself
for lib in wsme pecan; do
if ! python -c "import $lib" 2>/dev/null; then
echo "Found old $lib... removing to ensure consistency"
local PIP_CMD=$(get_pip_command)
pip_install $lib
sudo $PIP_CMD uninstall -y $lib
fi
done
}
# Restore xtrace # Restore xtrace
$XTRACE $XTRACE