git://git.onelab.eu
/
plstackapi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
run migrate for django 1.7 or evolve for django 1.5
[plstackapi.git]
/
planetstack
/
scripts
/
opencloud
diff --git
a/planetstack/scripts/opencloud
b/planetstack/scripts/opencloud
index
ff6eefc
..
b307e66
100755
(executable)
--- a/
planetstack/scripts/opencloud
+++ b/
planetstack/scripts/opencloud
@@
-134,15
+134,14
@@
if [ "$COMMAND" = "restoredb" ]; then
createdb
syncdb
fi
createdb
syncdb
fi
-if [ "$COMMAND" = "evolvedb" ]; then
+if [ "$COMMAND" = "evolvedb"
-o "$COMMAND" = "migratedb"
]; then
stopserver
ensure_postgres_running
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
fi
if [ "$COMMAND" = "resetdb" ]; then
stopserver