From 21cb67c1e5058591d907641dbd6805ceafcad308 Mon Sep 17 00:00:00 2001 From: Christian Berendt Date: Mon, 4 Aug 2014 14:29:55 +0200 Subject: [PATCH] Remove code tagged as "can be removed after Icehouse" Change-Id: Ib78f3d55c9dcd46e0dfc3343c32e077cf530b5f7 --- lib/stackforge | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/lib/stackforge b/lib/stackforge index e6528afc59..b744318042 100644 --- a/lib/stackforge +++ b/lib/stackforge @@ -35,10 +35,6 @@ PECAN_DIR=$DEST/pecan # install_stackforge() - Collect source and prepare 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 setup_package $WSME_DIR @@ -46,20 +42,6 @@ function install_stackforge { 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 $XTRACE