[bitbake-devel] [PATCH 3/4] bitbake: toastergui: Fix typo on layers in project filter condition

Ed Bartosh ed.bartosh at linux.intel.com
Thu Aug 6 16:23:48 UTC 2015


From: Michael Wood <michael.g.wood at intel.com>

Should be & rather than "and" which was returning the truth'd value of
the and condition.

[YOCTO #8114]

Signed-off-by: Michael Wood <michael.g.wood at intel.com>
Signed-off-by: Ed Bartosh <ed.bartosh at linux.intel.com>
---
 bitbake/lib/toaster/toastergui/tables.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bitbake/lib/toaster/toastergui/tables.py b/bitbake/lib/toaster/toastergui/tables.py
index 1187244..51fe4b6 100644
--- a/bitbake/lib/toaster/toastergui/tables.py
+++ b/bitbake/lib/toaster/toastergui/tables.py
@@ -312,7 +312,7 @@ class LayerMachinesTable(MachinesTable):
         MachinesTable.setup_queryset(self, *args, **kwargs)
 
         self.queryset = self.queryset.filter(layer_version__pk=int(kwargs['layerid']))
-        self.static_context_extra['in_prj'] = ProjectLayer.objects.filter(Q(project=kwargs['pid']) and Q(layercommit=kwargs['layerid'])).count()
+        self.static_context_extra['in_prj'] = ProjectLayer.objects.filter(Q(project=kwargs['pid']) & Q(layercommit=kwargs['layerid'])).count()
 
     def setup_columns(self, *args, **kwargs):
         self.add_column(title="Machine",
@@ -452,7 +452,7 @@ class LayerRecipesTable(RecipesTable):
         RecipesTable.setup_queryset(self, *args, **kwargs)
         self.queryset = self.queryset.filter(layer_version__pk=int(kwargs['layerid']))
 
-        self.static_context_extra['in_prj'] = ProjectLayer.objects.filter(Q(project=kwargs['pid']) and Q(layercommit=kwargs['layerid'])).count()
+        self.static_context_extra['in_prj'] = ProjectLayer.objects.filter(Q(project=kwargs['pid']) & Q(layercommit=kwargs['layerid'])).count()
 
     def setup_columns(self, *args, **kwargs):
         self.add_column(title="Recipe",
-- 
2.1.4




More information about the bitbake-devel mailing list