summaryrefslogtreecommitdiffstats
path: root/bitbake/lib
diff options
context:
space:
mode:
authorMichael Wood <michael.g.wood@intel.com>2016-03-09 13:01:24 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-09 22:47:29 +0000
commit0f0105932cbb364041d3380740ba481250bffe32 (patch)
treecbcbd3f74a79e336c9b062f6d1a94526c3ddb87a /bitbake/lib
parent0dcab0258e6e638db8b78fa3c7c7e485280712d4 (diff)
downloadpoky-0f0105932cbb364041d3380740ba481250bffe32.tar.gz
bitbake: toaster: models List only have the specified project's imported layers
When returning the compatible layers make sure that we are only listing: All the layers which are for this release && configuration layers (i.e. aren't part of the build history) and which aren't an imported layer OR are this project's imported layer(s). [YOCTO #8944] (Bitbake rev: de8baedaccb451c12bc3f642449db3f64aed6bf7) Signed-off-by: Michael Wood <michael.g.wood@intel.com> Signed-off-by: Elliot Smith <elliot.smith@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib')
-rw-r--r--bitbake/lib/toaster/orm/models.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/bitbake/lib/toaster/orm/models.py b/bitbake/lib/toaster/orm/models.py
index cfc6ea87c2..add2adea06 100644
--- a/bitbake/lib/toaster/orm/models.py
+++ b/bitbake/lib/toaster/orm/models.py
@@ -262,8 +262,10 @@ class Project(models.Model):
262 """ Returns Queryset of all Layer_Versions which are compatible with 262 """ Returns Queryset of all Layer_Versions which are compatible with
263 this project""" 263 this project"""
264 queryset = Layer_Version.objects.filter( 264 queryset = Layer_Version.objects.filter(
265 (Q(up_branch__name=self.release.branch_name) & Q(build=None)) 265 (Q(up_branch__name=self.release.branch_name) &
266 | Q(project=self)) 266 Q(build=None) &
267 Q(project=None)) |
268 Q(project=self))
267 269
268 return queryset 270 return queryset
269 271