mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-09 20:02:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

bitbake: toaster: Partial Revert "fixes after html5 compliance testing"

Browse Source 
Partial revert of bb commit 7aecb974d44d9bc711ffba5cc65e770811397fba

There were changes in this commit which broke the compatible layers
mechanism meaning that no layers, recipes or machines were showing.

(Bitbake rev: 124157b567469639c6c839233f42049a093ba083)

Signed-off-by: Michael Wood <michael.g.wood@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Michael Wood
2015-06-29 16:01:37 +01:00
committed by Richard Purdie
parent d73a813aa2
commit 3b3ef9cee2
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
bitbake/lib/toaster/orm/models.py
View File

@@ -180,9 +180,8 @@ class Project(models.Model):
if release == None:
release = self.release
# layers on the same branch or layers specifically set for this project
queryset = Layer_Version.objects.filter(Q(project = self) | Q(build__project = self))
if release is not None:
queryset = queryset.filter(Q(up_branch__name = release.branch_name) & Q(project = None))
queryset = Layer_Version.objects.filter((Q(up_branch__name = release.branch_name) & Q(project = None)) | Q(project = self) | Q(build__project = self))
if layer_name is not None:
# we select only a layer name
queryset = queryset.filter(layer__name = layer_name)