summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2015-12-09 19:56:41 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-14 23:13:07 +0000
commitc1c8eff3f91fe2d6cdde92a2b516554eba48a094 (patch)
treea0183c5e02a1e1833e5d39e66e3cd21682f9cd5a
parent507aafbd7ac90b4dfbe0f070e8180368012dc1f5 (diff)
downloadpoky-c1c8eff3f91fe2d6cdde92a2b516554eba48a094.tar.gz
bitbake: toaster: removed extra calls of migrate
One manage.py migrate should be enough to apply migrations for all applications. Extra calls just slow toaster script down. Removed calls of migrate for orm and bldcontrol apps. (Bitbake rev: 9299d7fa88e51294c4fd3f1354874d8253d25aff) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: brian avery <avery.brian@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xbitbake/bin/toaster20
1 files changed, 1 insertions, 19 deletions
diff --git a/bitbake/bin/toaster b/bitbake/bin/toaster
index 0862a3548a..7645c56b15 100755
--- a/bitbake/bin/toaster
+++ b/bitbake/bin/toaster
@@ -58,26 +58,8 @@ webserverStartAll()
58 # python bitbake/lib/toaster/manage.py python manage.py createsuperuser --username=<ME> 58 # python bitbake/lib/toaster/manage.py python manage.py createsuperuser --username=<ME>
59 python $BBBASEDIR/lib/toaster/manage.py migrate --noinput || retval=1 59 python $BBBASEDIR/lib/toaster/manage.py migrate --noinput || retval=1
60 60
61 python $BBBASEDIR/lib/toaster/manage.py migrate orm || retval=2
62
63 if [ $retval -eq 1 ]; then
64 echo "Failed db sync, aborting system start" 1>&2
65 return $retval
66 fi
67
68 python $BBBASEDIR/lib/toaster/manage.py migrate orm || retval=1
69
70 if [ $retval -eq 1 ]; then
71 printf "\nError on orm migration, rolling back...\n"
72 python $BBBASEDIR/lib/toaster/manage.py migrate orm 0001_initial --fake
73 return $retval
74 fi
75
76 python $BBBASEDIR/lib/toaster/manage.py migrate bldcontrol || retval=1
77
78 if [ $retval -eq 1 ]; then 61 if [ $retval -eq 1 ]; then
79 printf "\nError on bldcontrol migration, rolling back...\n" 62 echo "Failed migrations, aborting system start" 1>&2
80 python $BBBASEDIR/lib/toaster/manage.py migrate bldcontrol 0001_initial --fake
81 return $retval 63 return $retval
82 fi 64 fi
83 65