Skip to contentSkip to conversation

Toaster patches

PATCH In review Michael Wood 2 participants 4 messages Aug 12, 2015 – Aug 17, 2015

lore
Share & tools
lore

Michael Wood

author
#0 lore raw

cover Toaster patches

Reviewed by Michael Wood

The following changes since commit a8b723498c9a7106210db140452886894494b4d6:

bitbake: cooker: Resolve file monitoring race issues when using memres bitbake (2015-08-03 07:36:25 +0100)

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib michaelw/submit/bbarrosp/misc
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=michaelw/submit/bbarrosp/misc

Alexandru DAMIAN (1):
bitbake: toaster: fix invalid fields in the package details page

Belen Barros Pena (1):
Fix typo in set up script output

 lib/toaster/bldcontrol/management/commands/checksettings.py           | 2 +-
 .../toastergui/templates/package_included_reverse_dependencies.html   | 2 +-
 lib/toaster/toastergui/templates/tablesort.html                       | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)
Signature · 1 line
2.1.4
author
#1 lore raw

PATCH 1/2 Fix typo in set up script output

From: Belen Barros Pena <[email protected]>

Removing an spurious 'it' when setting the
build directory. Thanks to Scott Rifenbark for
finding the typo!

Signed-off-by Belen Barros Pena <[email protected]>
Signed-off-by Michael Wood <[email protected]>
---
 lib/toaster/bldcontrol/management/commands/checksettings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
lib/toaster/bldcontrol/management/commands/checksettings.py +1 -1
index 3002e4c..9a508b4 100644
@@ -133,7 +133,7 @@ class Command(NoArgsCommand):
                 def _update_builddir():
                     suggesteddir = self._get_suggested_builddir(be)
                     if len(suggesteddir) > 0:
-                        be.builddir = raw_input("Toaster needs to know where it your build directory is located.\n The build directory is where all the artifacts created by your builds will be stored. Toaster suggests \"%s\".\n Press Enter to select \"%s\" or type the full path to a different directory: " % (suggesteddir, suggesteddir))
+                        be.builddir = raw_input("Toaster needs to know where your build directory is located.\n The build directory is where all the artifacts created by your builds will be stored. Toaster suggests \"%s\".\n Press Enter to select \"%s\" or type the full path to a different directory: " % (suggesteddir, suggesteddir))
                     else:
                         be.builddir = raw_input("Toaster needs to know where is your build directory.\n The build directory is where all the artifacts created by your builds will be stored. Type the full path to the directory (for example: \" %s/build\")" % os.environ.get('HOME','/tmp/'))
                     if len(be.builddir) == 0 and len(suggesteddir) > 0:
Signature · 1 line
2.1.4
author
#2 lore raw

PATCH 2/2 bitbake: toaster: fix invalid fields in the package details page

From: Alexandru DAMIAN <[email protected]>

This patch safeguards referencing invalid fields in the project details template, and fixes errors thrown in the page.

[YOCTO #7992]

Signed-off-by Alexandru DAMIAN <[email protected]>
Signed-off-by Belen Barros Pena <[email protected]>
---
 .../toastergui/templates/package_included_reverse_dependencies.html   | 2 +-
 lib/toaster/toastergui/templates/tablesort.html                       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
lib/toaster/toastergui/templates/package_included_reverse_dependencies.html +1 -1
index 4ba472f..5cc8b47 100644
@@ -23,7 +23,7 @@
             {% include "tablesort.html" %}
                 <tbody>
 					{% for reverse_dep in objects %}
-                        <tr {{reverse_dep.size|format_vpackage_rowclass}} >
+                        <tr {% if reverse_dep.size %}{{reverse_dep.size|format_vpackage_rowclass}}{%endif%} >
                         {% if reverse_dep.size != -1 %}
                             <td>
                                 <a href="{% url 'package_included_detail' build.id target.id reverse_dep.package_id %}">
lib/toaster/toastergui/templates/tablesort.html +2 -2
index bf311b6..3624742 100644
@@ -5,7 +5,7 @@
     <thead>
         <tr>
             {% for tc in tablecols %}
-            <th class="{{tc.dclass}} {{tc.clclass}}">
+            <th class="{%if tc.dclass%}{{tc.dclass}}{%endif%} {%if tc.clclass%}{{tc.clclass}}{%endif%}">
                 {%if tc.qhelp%}<i class="icon-question-sign get-help" title="{{tc.qhelp}}"></i>{%endif%}
                 {{tc.name}}
             </th>

@@ -18,7 +18,7 @@
         <!-- Table header row; generated from "tablecols" entry in the context dict -->
         <tr>
             {% for tc in tablecols %}
-            <th class="{{tc.dclass}} {{tc.clclass}}">
+            <th class="{%if tc.dclass%}{{tc.dclass}}{%endif%} {%if tc.clclass%}{{tc.clclass}}{%endif%}">
                 {%if tc.qhelp%}<i class="icon-question-sign get-help" title="{{tc.qhelp}}"></i>{%endif%}
                 {%if tc.orderfield%}
                     <a {%if tc.ordericon%} class="sorted" {%endif%}
Signature · 1 line
2.1.4
#3 lore raw
In reply to Michael Wood
Quoted 8 lines · Michael Wood

Reviewed by Michael Wood

The following changes since commit a8b723498c9a7106210db140452886894494b4d6:

bitbake: cooker: Resolve file monitoring race issues when using memres bitbake (2015-08-03 07:36:25 +0100)

are available in the git repository at:

Quoted 8 lines

git://git.yoctoproject.org/poky-contrib michaelw/submit/bbarrosp/misc
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=michaelw/submit/bbarrosp/misc

Alexandru DAMIAN (1):
bitbake: toaster: fix invalid fields in the package details page

Belen Barros Pena (1):
Fix typo in set up script output

I merged these however I would note that the prefixes in the shortlogs are becoming a little inconsistent with the recent toaster patches. I added in a toaster: and removed a bitbake: in this case.

Cheers,

Richard