[PATCH 0/2] small improvements to startup, upgrade to latest Django 1.6

[PATCH 0/2] small improvements to startup, upgrade to latest Django 1.6

[brian avery]

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 awhile).

-b

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 bavery/toaster/small-script-improvement
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=bavery/toaster/small-script-improvement

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

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

-- 
1.9.1

[PATCH 0/2] small improvements to startup, upgrade to latest Django 1.6

[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.

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

[Elliot Smith]

From: brian avery <avery.brian@gmail.com>

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

Signed-off-by: brian avery <avery.brian@gmail.com>
Signed-off-by: Elliot Smith <elliot.smith@intel.com>
---
 bin/toaster | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/bin/toaster b/bin/toaster
index ac27826..2153282 100755
--- a/bin/toaster
+++ b/bin/toaster
@@ -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.

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

[Elliot Smith]

From: brian avery <avery.brian@gmail.com>

getting the latest 1.6 available gives us the most bug fixes

Signed-off-by: brian avery <avery.brian@gmail.com>
Signed-off-by: Elliot Smith <elliot.smith@intel.com>
---
 toaster-requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toaster-requirements.txt b/toaster-requirements.txt
index c4a2221..358e662 100644
--- a/toaster-requirements.txt
+++ b/toaster-requirements.txt
@@ -1,4 +1,4 @@
-Django==1.6
+Django<1.7
 South==0.8.4
 argparse==1.2.1
 wsgiref==0.1.2
-- 
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.

Re: [PATCH 0/2] small improvements to startup, upgrade to latest Django 1.6

[Smith, Elliot]

[-- Attachment #1: Type: text/plain, Size: 456 bytes --]

On 24 September 2015 at 00:07, brian avery <avery.brian@gmail.com> wrote:

> 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 awhile).
>

Looks good to me, sent upstream.

Elliot

-- 
Elliot Smith
Software Engineer
Intel Open Source Technology Centre

[-- Attachment #2: Type: text/html, Size: 873 bytes --]

Re: [PATCH 0/2] small improvements to startup, upgrade to latest Django 1.6

[Barros Pena, Belen]

On 24/09/2015 00:07, "toaster-bounces@yoctoproject.org on behalf of brian
avery" <toaster-bounces@yoctoproject.org on behalf of
avery.brian@gmail.com> wrote:

>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 awhile).
>
>-b
>
>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
>bavery/toaster/small-script-improvement
>  
>http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=bavery/toaster/sm
>all-script-improvement

I think this is already sent to bitbake-devel, but using this brach the
web server failed to start (managed mode). The toaster_web.log file says:

CommandError: "0.0.0.0:" is not a valid port number or address:port pair.


I am using sqlite.

Cheers

Belén

>
>brian avery (2):
>  toaster: small improvements to the startup script
>  toaster: change requuirements.txt to get the latest 1.6 django version
>
> bitbake/bin/toaster              | 12 ++++++------
> bitbake/toaster-requirements.txt |  2 +-
> 2 files changed, 7 insertions(+), 7 deletions(-)
>
>-- 
>1.9.1
>
>-- 
>_______________________________________________
>toaster mailing list
>toaster@yoctoproject.org
>https://lists.yoctoproject.org/listinfo/toaster

Re: [PATCH 0/2] small improvements to startup, upgrade to latest Django 1.6

[Brian Avery]

My bad. I tend to start with webport=800x which obscured the bug. I'll
submit a fix tonite.  you can use webport=8000 as wa workaround in the
meantime.


-b

On Mon, Sep 28, 2015 at 4:41 AM, Barros Pena, Belen
<belen.barros.pena@intel.com> wrote:
> On 24/09/2015 00:07, "toaster-bounces@yoctoproject.org on behalf of brian
> avery" <toaster-bounces@yoctoproject.org on behalf of
> avery.brian@gmail.com> wrote:
>
>>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 awhile).
>>
>>-b
>>
>>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
>>bavery/toaster/small-script-improvement
>>
>>http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=bavery/toaster/sm
>>all-script-improvement
>
> I think this is already sent to bitbake-devel, but using this brach the
> web server failed to start (managed mode). The toaster_web.log file says:
>
> CommandError: "0.0.0.0:" is not a valid port number or address:port pair.
>
>
> I am using sqlite.
>
> Cheers
>
> Belén
>
>>
>>brian avery (2):
>>  toaster: small improvements to the startup script
>>  toaster: change requuirements.txt to get the latest 1.6 django version
>>
>> bitbake/bin/toaster              | 12 ++++++------
>> bitbake/toaster-requirements.txt |  2 +-
>> 2 files changed, 7 insertions(+), 7 deletions(-)
>>
>>--
>>1.9.1
>>
>>--
>>_______________________________________________
>>toaster mailing list
>>toaster@yoctoproject.org
>>https://lists.yoctoproject.org/listinfo/toaster
>

Re: [PATCH 0/2] small improvements to startup, upgrade to latest Django 1.6

[Brian Avery]

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

On Thu, Sep 24, 2015 at 3:31 AM, Elliot Smith <elliot.smith@intel.com> wrote:
> 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.
>

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

[Brian Avery]

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

On Thu, Sep 24, 2015 at 3:31 AM, Elliot Smith <elliot.smith@intel.com> wrote:
> From: brian avery <avery.brian@gmail.com>
>
> 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
>
> Signed-off-by: brian avery <avery.brian@gmail.com>
> Signed-off-by: Elliot Smith <elliot.smith@intel.com>
> ---
>  bin/toaster | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/bin/toaster b/bin/toaster
> index ac27826..2153282 100755
> --- a/bin/toaster
> +++ b/bin/toaster
> @@ -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.
>