diff options
| author | Dave Lerner <dave.lerner@windriver.com> | 2014-03-26 15:49:43 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-04-01 10:22:43 +0100 |
| commit | 362b71a07c714ebe03df40beecaca99dc9447e0c (patch) | |
| tree | 1b47e0ae97c93706bd2acbfd33dd5a7c59a845e2 | |
| parent | 69856969d71fd3683d64ece1c588732ed833a041 (diff) | |
| download | ast2050-yocto-poky-362b71a07c714ebe03df40beecaca99dc9447e0c.zip ast2050-yocto-poky-362b71a07c714ebe03df40beecaca99dc9447e0c.tar.gz | |
bitbake: toaster: unbuilt package dependency formats
[YOCTO 6057]
For a package shown on the package build dependency page, the dependent
packages may be unbuilt packages, as indicated with the dependent
package's size set to -1. This fix changes the build template to use
the same formatting functions for unbuilt dependent packages as the
include package templates use for unbuilt dependent packages.
(Bitbake rev: b095ab30a827a50f66a06ac9170d33fae2670736)
Signed-off-by: Dave Lerner <dave.lerner@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | bitbake/lib/toaster/toastergui/templates/package_built_dependencies.html | 75 |
1 files changed, 33 insertions, 42 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/package_built_dependencies.html b/bitbake/lib/toaster/toastergui/templates/package_built_dependencies.html index a2011d6..8613f1e 100644 --- a/bitbake/lib/toaster/toastergui/templates/package_built_dependencies.html +++ b/bitbake/lib/toaster/toastergui/templates/package_built_dependencies.html @@ -36,24 +36,21 @@ </thead> <tbody> {% for runtime_dep in runtime_deps %} - {% ifequal runtime_dep.version '' %} - <tr class="muted"> - <td>{{runtime_dep.name}}</td> - <td>{{runtime_dep.version}}</td> - <td></td> - </div> - </tr> + <tr {{runtime_dep.size|format_vpackage_rowclass}} > + {% if runtime_dep.size != -1 %} + <td> + <a href="{% url 'package_built_detail' build.id runtime_dep.depends_on_id %}"> + {{runtime_dep.name}} + </a> + </td> {% else %} - <tr> - <td> - <a href="{% url 'package_built_detail' build.id runtime_dep.depends_on_id %}"> - {{runtime_dep.name}} - </a> - </td> - <td>{{runtime_dep.version}}</td> - <td>{{runtime_dep.size|filtered_filesizeformat}}</td> - </tr> - {% endifequal %} + <td> + {{runtime_dep.name|format_vpackage_namehelp}} + </td> + {% endif %} + <td>{{runtime_dep.version}}</td> + <td>{{runtime_dep.size|filtered_filesizeformat}}</td> + </tr> {% endfor %} </tbody> </table> @@ -74,31 +71,25 @@ </thead> <tbody> {% for other_dep in other_deps %} - {% ifequal other_dep.version '' %} - <tr class="muted"> - <td>{{other_dep.name}}</td> - <td>{{other_dep.version}}</td> - <td></td> - <td> - {{other_dep.dep_type_display}} - <i class="icon-question-sign get-help hover-help" title="{{other_dep.dep_type_help}}" ></i> - </td> - </tr> - {% else %} - <tr> - <td> - <a href="{% url 'package_built_detail' build.id other_dep.depends_on_id %}"> - {{other_dep.name}} - </a> - </td> - <td>{{other_dep.version}}</td> - <td>{{other_dep.size|filtered_filesizeformat}}</td> - <td> - {{other_dep.dep_type_display}} - <i class="icon-question-sign get-help hover-help" title="{{other_dep.dep_type_help}}" ></i> - </td> - </tr> - {% endifequal %} + <tr {{other_dep.size|format_vpackage_rowclass}} > + {% if other_dep.size != -1 %} + <td> + <a href="{% url 'package_built_detail' build.id other_dep.depends_on_id %}"> + {{other_dep.name}} + </a> + </td> + {% else %} + <td> + {{other_dep.name|format_vpackage_namehelp}} + </td> + {% endif %} + <td>{{other_dep.version}}</td> + <td>{{other_dep.size|filtered_filesizeformat}}</td> + <td> + {{other_dep.dep_type_display}} + <i class="icon-question-sign get-help hover-help" title="{{other_dep.dep_type_help}}" ></i> + </td> + </tr> {% endfor %} </tbody> </table> |
