From c2a4c9238d4004f0271d51a5fc9b66bb94ba3a8f Mon Sep 17 00:00:00 2001 From: Alessio Ababilov Date: Fri, 16 Aug 2013 21:53:22 +0300 Subject: [PATCH] Fix 'olso' typo in lib/oslo This enables commit If92073be5a431840701c952a194e63a7c452c9ca for cleaning up potentially installed older oslo.config. Here are its original details. If the user had oslo.config installed prior to us setting up the oslo.config out of git they can get themselves into this very funny situation where pip doesn't see oslo.config 1.1.x, however some packages might. This manifests itself as a user error trying to start nova-api which uses DeprecatedOption, not in oslo.config 1.1.x Because of the funny state pip is in, you can't uninstall oslo.config. So in these situations, if we see old oslo.config in the filesystem, pip install / uninstall it to ensure that everyone ends up using the git version instead. To reduce the amount of user confusion, do this on every install_oslo for a while, which we can purge after Havana ships. Change-Id: I7fa0b70497bf5622f4638da284afe5363a004d3c Fixes: bug #1213089 --- lib/oslo | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/oslo b/lib/oslo index 449c4de17f..f77a4fa941 100644 --- a/lib/oslo +++ b/lib/oslo @@ -40,12 +40,12 @@ function install_oslo() { # cleanup_oslo() - purge possibly old versions of oslo function cleanup_oslo() { - # this means we've got an old olso installed, lets get rid of it + # this means we've got an old oslo installed, lets get rid of it if ! python -c 'import oslo.config' 2>/dev/null; then echo "Found old oslo.config... removing to ensure consistency" local PIP_CMD=$(get_pip_command) - pip_install olso.config - sudo $PIP_CMD uninstall -y olso.config + pip_install oslo.config + sudo $PIP_CMD uninstall -y oslo.config fi }