[oe-commits] [bitbake] 01/02: toaster: models List only have the specified project's imported layers

[git at git.openembedded.org]

rpurdie pushed a commit to branch master
in repository bitbake.

commit de8baedaccb451c12bc3f642449db3f64aed6bf7
Author: Michael Wood <michael.g.wood at intel.com>
AuthorDate: Wed Mar 9 13:01:24 2016 +0000

    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]
    
    Signed-off-by: Michael Wood <michael.g.wood at intel.com>
    Signed-off-by: Elliot Smith <elliot.smith at intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 lib/toaster/orm/models.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/toaster/orm/models.py b/lib/toaster/orm/models.py
index cfc6ea8..add2ade 100644
--- a/lib/toaster/orm/models.py
+++ b/lib/toaster/orm/models.py
@@ -262,8 +262,10 @@ class Project(models.Model):
         """ Returns Queryset of all Layer_Versions which are compatible with
         this project"""
         queryset = Layer_Version.objects.filter(
-            (Q(up_branch__name=self.release.branch_name) & Q(build=None))
-            | Q(project=self))
+            (Q(up_branch__name=self.release.branch_name) &
+             Q(build=None) &
+             Q(project=None)) |
+             Q(project=self))
 
         return queryset
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.