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 /bitbake/lib/toaster/toastergui | |
parent | 69856969d71fd3683d64ece1c588732ed833a041 (diff) | |
download | 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>
Diffstat (limited to 'bitbake/lib/toaster/toastergui')
-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 a2011d6fb6..8613f1e732 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 @@ | |||
36 | </thead> | 36 | </thead> |
37 | <tbody> | 37 | <tbody> |
38 | {% for runtime_dep in runtime_deps %} | 38 | {% for runtime_dep in runtime_deps %} |
39 | {% ifequal runtime_dep.version '' %} | 39 | <tr {{runtime_dep.size|format_vpackage_rowclass}} > |
40 | <tr class="muted"> | 40 | {% if runtime_dep.size != -1 %} |
41 | <td>{{runtime_dep.name}}</td> | 41 | <td> |
42 | <td>{{runtime_dep.version}}</td> | 42 | <a href="{% url 'package_built_detail' build.id runtime_dep.depends_on_id %}"> |
43 | <td></td> | 43 | {{runtime_dep.name}} |
44 | </div> | 44 | </a> |
45 | </tr> | 45 | </td> |
46 | {% else %} | 46 | {% else %} |
47 | <tr> | 47 | <td> |
48 | <td> | 48 | {{runtime_dep.name|format_vpackage_namehelp}} |
49 | <a href="{% url 'package_built_detail' build.id runtime_dep.depends_on_id %}"> | 49 | </td> |
50 | {{runtime_dep.name}} | 50 | {% endif %} |
51 | </a> | 51 | <td>{{runtime_dep.version}}</td> |
52 | </td> | 52 | <td>{{runtime_dep.size|filtered_filesizeformat}}</td> |
53 | <td>{{runtime_dep.version}}</td> | 53 | </tr> |
54 | <td>{{runtime_dep.size|filtered_filesizeformat}}</td> | ||
55 | </tr> | ||
56 | {% endifequal %} | ||
57 | {% endfor %} | 54 | {% endfor %} |
58 | </tbody> | 55 | </tbody> |
59 | </table> | 56 | </table> |
@@ -74,31 +71,25 @@ | |||
74 | </thead> | 71 | </thead> |
75 | <tbody> | 72 | <tbody> |
76 | {% for other_dep in other_deps %} | 73 | {% for other_dep in other_deps %} |
77 | {% ifequal other_dep.version '' %} | 74 | <tr {{other_dep.size|format_vpackage_rowclass}} > |
78 | <tr class="muted"> | 75 | {% if other_dep.size != -1 %} |
79 | <td>{{other_dep.name}}</td> | 76 | <td> |
80 | <td>{{other_dep.version}}</td> | 77 | <a href="{% url 'package_built_detail' build.id other_dep.depends_on_id %}"> |
81 | <td></td> | 78 | {{other_dep.name}} |
82 | <td> | 79 | </a> |
83 | {{other_dep.dep_type_display}} | 80 | </td> |
84 | <i class="icon-question-sign get-help hover-help" title="{{other_dep.dep_type_help}}" ></i> | 81 | {% else %} |
85 | </td> | 82 | <td> |
86 | </tr> | 83 | {{other_dep.name|format_vpackage_namehelp}} |
87 | {% else %} | 84 | </td> |
88 | <tr> | 85 | {% endif %} |
89 | <td> | 86 | <td>{{other_dep.version}}</td> |
90 | <a href="{% url 'package_built_detail' build.id other_dep.depends_on_id %}"> | 87 | <td>{{other_dep.size|filtered_filesizeformat}}</td> |
91 | {{other_dep.name}} | 88 | <td> |
92 | </a> | 89 | {{other_dep.dep_type_display}} |
93 | </td> | 90 | <i class="icon-question-sign get-help hover-help" title="{{other_dep.dep_type_help}}" ></i> |
94 | <td>{{other_dep.version}}</td> | 91 | </td> |
95 | <td>{{other_dep.size|filtered_filesizeformat}}</td> | 92 | </tr> |
96 | <td> | ||
97 | {{other_dep.dep_type_display}} | ||
98 | <i class="icon-question-sign get-help hover-help" title="{{other_dep.dep_type_help}}" ></i> | ||
99 | </td> | ||
100 | </tr> | ||
101 | {% endifequal %} | ||
102 | {% endfor %} | 93 | {% endfor %} |
103 | </tbody> | 94 | </tbody> |
104 | </table> | 95 | </table> |