On 06/07/2012 06:06 PM, William Mills wrote:
2) lava-deployment-tool does not handle uwsgi download correctly
tarball has moved to old/
some places fixed others not
workaround: patch to centralize definition

FYI: Patch attached.
=== modified file 'lava-deployment-tool'
--- old/lava-deployment-tool	2012-05-25 03:27:18 +0000
+++ new/lava-deployment-tool	2012-05-31 19:28:56 +0000
@@ -19,6 +19,8 @@
 
 # All of LAVA is being served by this uWSGI version
 LAVA_UWSGI=1.0.3
+LAVA_URL="http://projects.unbit.it/downloads/old/uwsgi-$LAVA_UWSGI.tar.gz";
+LAVA_URL_ESC="http%3A%2F%2Fprojects.unbit.it%2Fdownloads%2Fold%2Fuwsgi-$LAVA_UWSGI.tar.gz"
 
 # Current version of setup required by lava (global state)
 export LAVA_SETUP_REQUIRED_VERSION=20
@@ -618,10 +620,10 @@
     if [ \! -e /etc/apache2/mods-available/uwsgi.load ]; then
         logger "Building uWSGI apache module..."
         # NOTE: we may not have this file cached as we used bundle to get it
-        if [ ! -e $PIP_DOWNLOAD_CACHE/http%3A%2F%2Fprojects.unbit.it%2Fdownloads%2Fuwsgi-$LAVA_UWSGI.tar.gz ]; then
-            pip install $PIP_PROXY_OPTION --no-install http://projects.unbit.it/downloads/uwsgi-$LAVA_UWSGI.tar.gz || die "Failed to download uWSGI"
+        if [ ! -e $PIP_DOWNLOAD_CACHE/$LAVA_URL_ESC ]; then
+            pip install $PIP_PROXY_OPTION --no-install $LAVA_URL_ESC || die "Failed to download uWSGI"
         fi
-        ( cd $LAVA_PREFIX/$LAVA_INSTANCE/tmp && tar zxf $PIP_DOWNLOAD_CACHE/http%3A%2F%2Fprojects.unbit.it%2Fdownloads%2Fuwsgi-$LAVA_UWSGI.tar.gz )
+        ( cd $LAVA_PREFIX/$LAVA_INSTANCE/tmp && tar zxf $PIP_DOWNLOAD_CACHE/$LAVA_URL_ESC )
         ( cd $LAVA_PREFIX/$LAVA_INSTANCE/tmp/uwsgi-$LAVA_UWSGI/apache2 && sudo apxs2 -c -i -a mod_uwsgi.c )
     fi
 

_______________________________________________
linaro-validation mailing list
[email protected]
http://lists.linaro.org/mailman/listinfo/linaro-validation

Reply via email to