[Branch,~linaro-validation/lava-dashboard/trunk] Rev 273: Fix setup-dev-env.sh so that it works again

Message ID 20111018192613.7255.42147.launchpad@ackee.canonical.com
State Accepted
Headers show

Commit Message

Paul Larson Oct. 18, 2011, 7:26 p.m.
Merge authors:
  Paul Larson (pwlars)
Related merge proposals:
  https://code.launchpad.net/~pwlars/lava-dashboard/fix-setup-dev-env/+merge/77770
  proposed by: Paul Larson (pwlars)
  review: Approve - Zygmunt Krynicki (zkrynicki)
------------------------------------------------------------
revno: 273 [merge]
committer: Paul Larson <paul.larson@canonical.com>
branch nick: lava-dashboard
timestamp: Tue 2011-10-18 14:24:39 -0500
message:
  Fix setup-dev-env.sh so that it works again
modified:
  setup-dev-env.sh


--
lp:lava-dashboard
https://code.launchpad.net/~linaro-validation/lava-dashboard/trunk

You are subscribed to branch lp:lava-dashboard.
To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-dashboard/trunk/+edit-subscription

Patch

=== modified file 'setup-dev-env.sh'
--- setup-dev-env.sh	2011-06-26 09:13:57 +0000
+++ setup-dev-env.sh	2011-09-30 23:45:49 +0000
@@ -49,14 +49,14 @@ 
         # rm -rf dashboard_server/media/$DEVEL_DB/
     fi
     echo " * building cache of static files (as symlinks)"
-    lava-server build_static --link --noinput --verbosity=0
+    lava-server manage -d build_static --link --noinput --verbosity=0
     echo " * creating fresh database"
-    lava-server syncdb --noinput -v0
-    lava-server migrate -v0
+    lava-server manage -d syncdb --noinput -v0
+    lava-server manage -d migrate -v0
     for FIXTURE_PATHNAME in $ROOT/dashboard_app/fixtures/hacking_*.json; do
         FIXTURE=$(basename $FIXTURE_PATHNAME .json)
         echo " * importing data: $FIXTURE"
-        lava-server loaddata -v0 $FIXTURE
+        lava-server manage -d loaddata -v0 $FIXTURE
     done
     echo " * starting development server in the background"
     # Django debug server uses some thread magic to do autoreload. The problem
@@ -64,7 +64,7 @@ 
     # cannot kill (yay for services on linux). Now that's a cheesy way to kill
     # both reliably (or so it seems, I cannot explain it really). So yes, we
     # spawn an xterm and sleep for a while. Shell engineering...
-    xterm -e lava-server runserver 0.0.0.0:$PORT &
+    xterm -e lava-server manage -d runserver 0.0.0.0:$PORT &
     SERVER_PID=$!
     echo " * waiting for server to start up"
     sleep 5
@@ -89,7 +89,7 @@ 
     echo "All done!"
     echo
     echo "To get started run:"
-    echo "   DEVEL_DB=$DEVEL_DB lava-server runserver 0.0.0.0:$PORT"
+    echo "   DEVEL_DB=$DEVEL_DB lava-server manage -d runserver 0.0.0.0:$PORT"
     echo
     echo "Remeber, username: admin"
     echo "         password: admin"