Change-Id: Ib78f3d55c9dcd46e0dfc3343c32e077cf530b5f7
| ... | ... |
@@ -35,10 +35,6 @@ PECAN_DIR=$DEST/pecan |
| 35 | 35 |
|
| 36 | 36 |
# install_stackforge() - Collect source and prepare |
| 37 | 37 |
function install_stackforge {
|
| 38 |
- # TODO(sdague): remove this once we get to Icehouse, this just makes |
|
| 39 |
- # for a smoother transition of existing users. |
|
| 40 |
- cleanup_stackforge |
|
| 41 |
- |
|
| 42 | 38 |
git_clone $WSME_REPO $WSME_DIR $WSME_BRANCH |
| 43 | 39 |
setup_package $WSME_DIR |
| 44 | 40 |
|
| ... | ... |
@@ -46,20 +42,6 @@ function install_stackforge {
|
| 46 | 46 |
setup_package $PECAN_DIR |
| 47 | 47 |
} |
| 48 | 48 |
|
| 49 |
-# cleanup_stackforge() - purge possibly old versions of stackforge libraries |
|
| 50 |
-function cleanup_stackforge {
|
|
| 51 |
- # this means we've got an old version installed, lets get rid of it |
|
| 52 |
- # otherwise python hates itself |
|
| 53 |
- for lib in wsme pecan; do |
|
| 54 |
- if ! python -c "import $lib" 2>/dev/null; then |
|
| 55 |
- echo "Found old $lib... removing to ensure consistency" |
|
| 56 |
- local PIP_CMD=$(get_pip_command) |
|
| 57 |
- pip_install $lib |
|
| 58 |
- sudo $PIP_CMD uninstall -y $lib |
|
| 59 |
- fi |
|
| 60 |
- done |
|
| 61 |
-} |
|
| 62 |
- |
|
| 63 | 49 |
# Restore xtrace |
| 64 | 50 |
$XTRACE |
| 65 | 51 |
|