summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/ui
diff options
context:
space:
mode:
authorCristian Iorga <cristian.iorga@intel.com>2012-10-16 11:52:38 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-24 21:13:07 +0100
commit4a3b0d7287ba7ce223021d33895bf5c953f1e4dc (patch)
tree6b22f5dc4d66173d15e2c02fcf399f6d48798a68 /bitbake/lib/bb/ui
parentb3374dbfd01ea5c962625781b6b9ce19829f3d5e (diff)
downloadpoky-4a3b0d7287ba7ce223021d33895bf5c953f1e4dc.tar.gz
bitbake: bitbake: hob/hobwidget: "Brought in by" column is now displayed correctly
In "Edit Recipes" and "Edit packages" pages, the "Brought in by" column is displayed correctly, with the right number of additional packages and a proper title. Fixes [YOCTO #2195]. (Bitbake rev: 4d1d3e5a54eb718e2eee02f734d929f15ccf99ce) Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/ui')
-rw-r--r--bitbake/lib/bb/ui/crumbs/hobwidget.py10
-rwxr-xr-xbitbake/lib/bb/ui/crumbs/packageselectionpage.py2
-rwxr-xr-xbitbake/lib/bb/ui/crumbs/recipeselectionpage.py2
3 files changed, 10 insertions, 4 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/hobwidget.py b/bitbake/lib/bb/ui/crumbs/hobwidget.py
index 28dc375da5..65de9df78f 100644
--- a/bitbake/lib/bb/ui/crumbs/hobwidget.py
+++ b/bitbake/lib/bb/ui/crumbs/hobwidget.py
@@ -155,9 +155,15 @@ class HobViewTable (gtk.VBox):
155 bin = binb.split(', ') 155 bin = binb.split(', ')
156 total_no = len(bin) 156 total_no = len(bin)
157 if total_no > 1 and bin[0] == "User Selected": 157 if total_no > 1 and bin[0] == "User Selected":
158 present_binb = bin[1] + ' (+' + str(total_no) + ')' 158 if total_no > 2:
159 present_binb = bin[1] + ' (+' + str(total_no - 1) + ')'
160 else:
161 present_binb = bin[1]
159 else: 162 else:
160 present_binb = bin[0] + ' (+' + str(total_no) + ')' 163 if total_no > 1:
164 present_binb = bin[0] + ' (+' + str(total_no - 1) + ')'
165 else:
166 present_binb = bin[0]
161 cell.set_property('text', present_binb) 167 cell.set_property('text', present_binb)
162 else: 168 else:
163 cell.set_property('text', "") 169 cell.set_property('text', "")
diff --git a/bitbake/lib/bb/ui/crumbs/packageselectionpage.py b/bitbake/lib/bb/ui/crumbs/packageselectionpage.py
index 8eb388e57c..17b1dfe3c4 100755
--- a/bitbake/lib/bb/ui/crumbs/packageselectionpage.py
+++ b/bitbake/lib/bb/ui/crumbs/packageselectionpage.py
@@ -52,7 +52,7 @@ class PackageSelectionPage (HobPage):
52 'col_max' : 300, 52 'col_max' : 300,
53 'expand' : 'True' 53 'expand' : 'True'
54 }, { 54 }, {
55 'col_name' : 'Brought in by', 55 'col_name' : 'Brought in by (+others)',
56 'col_id' : PackageListModel.COL_BINB, 56 'col_id' : PackageListModel.COL_BINB,
57 'col_style': 'binb', 57 'col_style': 'binb',
58 'col_min' : 100, 58 'col_min' : 100,
diff --git a/bitbake/lib/bb/ui/crumbs/recipeselectionpage.py b/bitbake/lib/bb/ui/crumbs/recipeselectionpage.py
index 79c7790819..fea92b5148 100755
--- a/bitbake/lib/bb/ui/crumbs/recipeselectionpage.py
+++ b/bitbake/lib/bb/ui/crumbs/recipeselectionpage.py
@@ -52,7 +52,7 @@ class RecipeSelectionPage (HobPage):
52 'col_max' : 300, 52 'col_max' : 300,
53 'expand' : 'True' 53 'expand' : 'True'
54 }, { 54 }, {
55 'col_name' : 'Brought in by', 55 'col_name' : 'Brought in by (+others)',
56 'col_id' : RecipeListModel.COL_BINB, 56 'col_id' : RecipeListModel.COL_BINB,
57 'col_style': 'binb', 57 'col_style': 'binb',
58 'col_min' : 100, 58 'col_min' : 100,