Skip to contentSkip to conversation

small improvements to startup, upgrade to latest Django 1.6

PATCH In review Elliot Smith 2 participants 5 messages Sep 24, 2015 – Sep 29, 2015

lore
Share & tools
lore
#0 lore raw

cover small improvements to startup, upgrade to latest Django 1.6

This eliminates the question about making a superuser on startup in managed mode. It also uses the value of WEB_PORT if defined in analysis mode.
It upgrades requirements.txt to the latest Django 1.6 (which I've been running for a while).

The following changes since commit 9f66aa1a11b5b45280aa41bf4517ec56ee5f2ab2:

bitbake: toaster: start script warning text formatting small improvement (2015-09-23 22:44:56 +0100)

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib elliot/submit/bavery/toaster/small-script-improvement
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=elliot/submit/bavery/toaster/small-script-improvement

brian avery (2):
toaster: small improvements to the startup script
toaster: change requirements.txt to get the latest 1.6 django version

 bin/toaster              | 12 ++++++------
 toaster-requirements.txt |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

--
1.9.3

---------------------------------------------------------------------
Intel Corporation (UK) Limited
Registered No. 1134945 (England)
Registered Office: Pipers Way, Swindon SN3 1RJ
VAT No: 860 2173 47

This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies.

#1 lore raw

PATCH 1/2 toaster: small improvements to the startup script

From: brian avery <[email protected]>

Do not ask the user to create a superuser on running in managed mode

Correctly inherit the env variable WEB_PORT if set in analysis mode

---
 bin/toaster | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
bin/toaster +6 -6
index ac27826..2153282 100755
@@ -54,11 +54,9 @@ webserverStartAll()
     fi
 
     retval=0
-    if [ "$TOASTER_MANAGED" '=' '1' ]; then
-        python $BBBASEDIR/lib/toaster/manage.py syncdb || retval=1
-    else
-        python $BBBASEDIR/lib/toaster/manage.py syncdb --noinput || retval=1
-    fi
+    # you can always add a superuser later via
+    # python bitbake/lib/toaster/manage.py python manage.py createsuperuser --username=<ME>
+    python $BBBASEDIR/lib/toaster/manage.py syncdb --noinput || retval=1
     python $BBBASEDIR/lib/toaster/manage.py migrate orm || retval=2
     if [ $retval -eq 1 ]; then
         echo "Failed db sync, stopping system start" 1>&2
@@ -163,7 +161,9 @@ RUNNING=0
 NOTOASTERUI=0
 WEBSERVER=1
 TOASTER_BRBE=""
-WEB_PORT="8000"
+if [ "WEB_PORT" == "" ]; then
+    WEB_PORT="8000"
+fi
 NOBROWSER=0
 
 for param in $*; do
Signature · 12 lines
1.9.3

---------------------------------------------------------------------
Intel Corporation (UK) Limited
Registered No. 1134945 (England)
Registered Office: Pipers Way, Swindon SN3 1RJ
VAT No: 860 2173 47

This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.
#2 lore raw

PATCH 2/2 toaster: change requirements.txt to get the latest 1.6 django version

From: brian avery <[email protected]>

getting the latest 1.6 available gives us the most bug fixes

---
 toaster-requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
toaster-requirements.txt +1 -1
index c4a2221..358e662 100644
@@ -1,4 +1,4 @@
-Django==1.6
+Django<1.7
 South==0.8.4
 argparse==1.2.1
 wsgiref==0.1.2
Signature · 12 lines
1.9.3

---------------------------------------------------------------------
Intel Corporation (UK) Limited
Registered No. 1134945 (England)
Registered Office: Pipers Way, Swindon SN3 1RJ
VAT No: 860 2173 47

This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.
#3 lore raw

Re: [PATCH 1/2] toaster: small improvements to the startup script

In reply to Elliot Smith

this patch contains a typo. I'll resubmit.
-b

Quoted 56 lines · Elliot Smith

From: brian avery <[email protected]>

Do not ask the user to create a superuser on running in managed mode

Correctly inherit the env variable WEB_PORT if set in analysis mode

---
 bin/toaster | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
bin/toaster +6 -7
index ac27826..2153282 100755
@@ -54,11 +54,9 @@ webserverStartAll()
     fi
 
     retval=0
-    if [ "$TOASTER_MANAGED" '=' '1' ]; then
-        python $BBBASEDIR/lib/toaster/manage.py syncdb || retval=1
-    else
-        python $BBBASEDIR/lib/toaster/manage.py syncdb --noinput || retval=1
-    fi
+    # you can always add a superuser later via
+    # python bitbake/lib/toaster/manage.py python manage.py createsuperuser --username=<ME>
+    python $BBBASEDIR/lib/toaster/manage.py syncdb --noinput || retval=1
     python $BBBASEDIR/lib/toaster/manage.py migrate orm || retval=2
     if [ $retval -eq 1 ]; then
         echo "Failed db sync, stopping system start" 1>&2
@@ -163,7 +161,9 @@ RUNNING=0
 NOTOASTERUI=0
 WEBSERVER=1
 TOASTER_BRBE=""
-WEB_PORT="8000"
+if [ "WEB_PORT" == "" ]; then
+    WEB_PORT="8000"
+fi
 NOBROWSER=0
 
 for param in $*; do
--

1.9.3

---------------------------------------------------------------------
Intel Corporation (UK) Limited
Registered No. 1134945 (England)
Registered Office: Pipers Way, Swindon SN3 1RJ
VAT No: 860 2173 47

This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies.

#4 lore raw
In reply to Elliot Smith

this patch contains a typo. I'll resubmit.
-b

Quoted 35 lines · Elliot Smith

This eliminates the question about making a superuser on startup in managed mode. It also uses the value of WEB_PORT if defined in analysis mode.
It upgrades requirements.txt to the latest Django 1.6 (which I've been running for a while).

The following changes since commit 9f66aa1a11b5b45280aa41bf4517ec56ee5f2ab2:

bitbake: toaster: start script warning text formatting small improvement (2015-09-23 22:44:56 +0100)

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib elliot/submit/bavery/toaster/small-script-improvement
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=elliot/submit/bavery/toaster/small-script-improvement

brian avery (2):
toaster: small improvements to the startup script
toaster: change requirements.txt to get the latest 1.6 django version

 bin/toaster              | 12 ++++++------
 toaster-requirements.txt |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

--
1.9.3

---------------------------------------------------------------------
Intel Corporation (UK) Limited
Registered No. 1134945 (England)
Registered Office: Pipers Way, Swindon SN3 1RJ
VAT No: 860 2173 47

This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies.