X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetstack%2Fscripts%2Fopencloud;h=b307e6678a3496d040a340022599eada11655a5d;hb=a99cbefc194c3f107848bf3fdc74b19ea809d865;hp=ff6eefcf8c92625d0409f48a2b066bf5dca9511a;hpb=f3526efbc9f344e2e10c2f0ad1569e8f947302df;p=plstackapi.git

diff --git a/planetstack/scripts/opencloud b/planetstack/scripts/opencloud
index ff6eefc..b307e66 100755
--- a/planetstack/scripts/opencloud
+++ b/planetstack/scripts/opencloud
@@ -134,15 +134,14 @@ if [ "$COMMAND" = "restoredb" ]; then
     createdb
     syncdb
 fi
-if [ "$COMMAND" = "evolvedb" ]; then
+if [ "$COMMAND" = "evolvedb" -o "$COMMAND" = "migratedb" ]; then
     stopserver
     ensure_postgres_running
-    evolvedb
-fi
-if [ "$COMMAND" = "migratedb" ]; then
-    stopserver
-    ensure_postgres_running
-    migratedb
+    if [[ $DJANGO_17 ]]; then
+        migratedb
+    else
+        evolvedb
+    fi
 fi
 if [ "$COMMAND" = "resetdb" ]; then
     stopserver