diff options
| author | Michael Wood <michael.g.wood@intel.com> | 2015-08-06 19:23:48 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-08-06 16:04:50 -0500 |
| commit | a65099eec3df428f33308a12611262f00ba90f56 (patch) | |
| tree | a03e18630c95ade72eb130cb76c30e904c68907a /bitbake | |
| parent | 5194f0401ec038359397fd22654f46b3612fc3a6 (diff) | |
| download | poky-a65099eec3df428f33308a12611262f00ba90f56.tar.gz | |
bitbake: toastergui: Fix typo on layers in project filter condition
Should be & rather than "and" which was returning the truth'd value of
the and condition.
[YOCTO #8114]
(Bitbake rev: 58035667e433f2b77f5cd48240dd051c35476284)
Signed-off-by: Michael Wood <michael.g.wood@intel.com>
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
| -rw-r--r-- | bitbake/lib/toaster/toastergui/tables.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bitbake/lib/toaster/toastergui/tables.py b/bitbake/lib/toaster/toastergui/tables.py index dd1688e51d..1af9c0bd90 100644 --- a/bitbake/lib/toaster/toastergui/tables.py +++ b/bitbake/lib/toaster/toastergui/tables.py | |||
| @@ -289,7 +289,7 @@ class LayerMachinesTable(MachinesTable): | |||
| 289 | MachinesTable.setup_queryset(self, *args, **kwargs) | 289 | MachinesTable.setup_queryset(self, *args, **kwargs) |
| 290 | 290 | ||
| 291 | self.queryset = self.queryset.filter(layer_version__pk=int(kwargs['layerid'])) | 291 | self.queryset = self.queryset.filter(layer_version__pk=int(kwargs['layerid'])) |
| 292 | self.static_context_extra['in_prj'] = ProjectLayer.objects.filter(Q(project=kwargs['pid']) and Q(layercommit=kwargs['layerid'])).count() | 292 | self.static_context_extra['in_prj'] = ProjectLayer.objects.filter(Q(project=kwargs['pid']) & Q(layercommit=kwargs['layerid'])).count() |
| 293 | 293 | ||
| 294 | def setup_columns(self, *args, **kwargs): | 294 | def setup_columns(self, *args, **kwargs): |
| 295 | self.add_column(title="Machine", | 295 | self.add_column(title="Machine", |
| @@ -425,7 +425,7 @@ class LayerRecipesTable(RecipesTable): | |||
| 425 | RecipesTable.setup_queryset(self, *args, **kwargs) | 425 | RecipesTable.setup_queryset(self, *args, **kwargs) |
| 426 | self.queryset = self.queryset.filter(layer_version__pk=int(kwargs['layerid'])) | 426 | self.queryset = self.queryset.filter(layer_version__pk=int(kwargs['layerid'])) |
| 427 | 427 | ||
| 428 | self.static_context_extra['in_prj'] = ProjectLayer.objects.filter(Q(project=kwargs['pid']) and Q(layercommit=kwargs['layerid'])).count() | 428 | self.static_context_extra['in_prj'] = ProjectLayer.objects.filter(Q(project=kwargs['pid']) & Q(layercommit=kwargs['layerid'])).count() |
| 429 | 429 | ||
| 430 | def setup_columns(self, *args, **kwargs): | 430 | def setup_columns(self, *args, **kwargs): |
| 431 | self.add_column(title="Recipe", | 431 | self.add_column(title="Recipe", |