[PATCH] toaster: models List only have the specified project's imported layers

[PATCH] toaster: models List only have the specified project's imported layers

[Michael Wood]

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@intel.com>
---
 bitbake/lib/toaster/orm/models.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/bitbake/lib/toaster/orm/models.py b/bitbake/lib/toaster/orm/models.py
index ab6940f..50f703c 100644
--- a/bitbake/lib/toaster/orm/models.py
+++ b/bitbake/lib/toaster/orm/models.py
@@ -259,8 +259,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
 
-- 
2.1.4

Re: [PATCH] toaster: models List only have the specified project's imported layers

[Barros Pena, Belen]

On 16/02/2016 11:25, "toaster-bounces@yoctoproject.org on behalf of
Michael Wood" <toaster-bounces@yoctoproject.org on behalf of
michael.g.wood@intel.com> wrote:

>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]

I can no longer reproduce the problem in 8944 with this patch, and I can
happily import a layer with the same name to a different project.

Thanks!

Belén

>
>Signed-off-by: Michael Wood <michael.g.wood@intel.com>
>---
> bitbake/lib/toaster/orm/models.py | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
>diff --git a/bitbake/lib/toaster/orm/models.py
>b/bitbake/lib/toaster/orm/models.py
>index ab6940f..50f703c 100644
>--- a/bitbake/lib/toaster/orm/models.py
>+++ b/bitbake/lib/toaster/orm/models.py
>@@ -259,8 +259,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
> 
>-- 
>2.1.4
>
>-- 
>_______________________________________________
>toaster mailing list
>toaster@yoctoproject.org
>https://lists.yoctoproject.org/listinfo/toaster

Re: [PATCH] toaster: models List only have the specified project's imported layers

[Michael Wood]

Don't think this has been upstreamed yet

On 17/02/16 09:48, Barros Pena, Belen wrote:
>
> On 16/02/2016 11:25, "toaster-bounces@yoctoproject.org on behalf of
> Michael Wood" <toaster-bounces@yoctoproject.org on behalf of
> michael.g.wood@intel.com> wrote:
>
>> 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]
> I can no longer reproduce the problem in 8944 with this patch, and I can
> happily import a layer with the same name to a different project.
>
> Thanks!
>
> Belén
>
>> Signed-off-by: Michael Wood <michael.g.wood@intel.com>
>> ---
>> bitbake/lib/toaster/orm/models.py | 6 ++++--
>> 1 file changed, 4 insertions(+), 2 deletions(-)
>>
>> diff --git a/bitbake/lib/toaster/orm/models.py
>> b/bitbake/lib/toaster/orm/models.py
>> index ab6940f..50f703c 100644
>> --- a/bitbake/lib/toaster/orm/models.py
>> +++ b/bitbake/lib/toaster/orm/models.py
>> @@ -259,8 +259,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
>>
>> -- 
>> 2.1.4
>>
>> -- 
>> _______________________________________________
>> toaster mailing list
>> toaster@yoctoproject.org
>> https://lists.yoctoproject.org/listinfo/toaster

[PATCH] toaster: models List only have the specified project's imported layers

[Elliot Smith]

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

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@intel.com>
Signed-off-by: Elliot Smith <elliot.smith@intel.com>
---
 bitbake/lib/toaster/orm/models.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/bitbake/lib/toaster/orm/models.py b/bitbake/lib/toaster/orm/models.py
index cfc6ea8..add2ade 100644
--- a/bitbake/lib/toaster/orm/models.py
+++ b/bitbake/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
 
-- 
1.9.1

---------------------------------------------------------------------
Intel Corporation (UK) Limited
Registered No. 1134945 (England)
Registered Office: Pipers Way, Swindon SN3 1RJ
VAT No: 860 2173 47

This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.

Re: [PATCH] toaster: models List only have the specified project's imported layers

[Smith, Elliot]

[-- Attachment #1: Type: text/plain, Size: 2385 bytes --]

Tested (as per https://bugzilla.yoctoproject.org/show_bug.cgi?id=8944#c0),
sent to bitbake-devel, and added to toaster-next.

Elliot

On 8 March 2016 at 20:11, Michael Wood <michael.g.wood@intel.com> wrote:

> Don't think this has been upstreamed yet
>
> On 17/02/16 09:48, Barros Pena, Belen wrote:
>
>>
>> On 16/02/2016 11:25, "toaster-bounces@yoctoproject.org on behalf of
>> Michael Wood" <toaster-bounces@yoctoproject.org on behalf of
>> michael.g.wood@intel.com> wrote:
>>
>> 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]
>>>
>> I can no longer reproduce the problem in 8944 with this patch, and I can
>> happily import a layer with the same name to a different project.
>>
>> Thanks!
>>
>> Belén
>>
>> Signed-off-by: Michael Wood <michael.g.wood@intel.com>
>>> ---
>>> bitbake/lib/toaster/orm/models.py | 6 ++++--
>>> 1 file changed, 4 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/bitbake/lib/toaster/orm/models.py
>>> b/bitbake/lib/toaster/orm/models.py
>>> index ab6940f..50f703c 100644
>>> --- a/bitbake/lib/toaster/orm/models.py
>>> +++ b/bitbake/lib/toaster/orm/models.py
>>> @@ -259,8 +259,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
>>>
>>> --
>>> 2.1.4
>>>
>>> --
>>> _______________________________________________
>>> toaster mailing list
>>> toaster@yoctoproject.org
>>> https://lists.yoctoproject.org/listinfo/toaster
>>>
>>
> --
> _______________________________________________
> toaster mailing list
> toaster@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/toaster
>



-- 
Elliot Smith
Software Engineer
Intel Open Source Technology Centre

[-- Attachment #2: Type: text/html, Size: 4090 bytes --]