From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by yocto-www.yoctoproject.org (Postfix, from userid 118) id DE18AE00848; Tue, 8 Mar 2016 12:11:08 -0800 (PST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on yocto-www.yoctoproject.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 X-Spam-HAM-Report: * -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low * trust * [74.125.82.45 listed in list.dnswl.org] * -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% * [score: 0.0000] * 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily * valid * -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Received: from mail-wm0-f45.google.com (mail-wm0-f45.google.com [74.125.82.45]) by yocto-www.yoctoproject.org (Postfix) with ESMTP id 8EC18E007F2 for ; Tue, 8 Mar 2016 12:11:05 -0800 (PST) Received: by mail-wm0-f45.google.com with SMTP id p65so43137655wmp.0 for ; Tue, 08 Mar 2016 12:11:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=subject:to:references:from:message-id:date:user-agent:mime-version :in-reply-to:content-transfer-encoding; bh=uAeTDHAlfBO41xlqaqmaYiBXuMBQuraJsML/fZb6R2c=; b=01mR8XX3TSNt72gqrp3tSxa/OPRXcJ/PIy3fAaa9c96Xh/l9vz1PC/TH30nfiO81sy jI555QfFpOqM2S245q6bXZC0UBVtUfdHQO9qTDTJnSCO0+l1UpZfb7boop458iqyJDF9 PL8QRetTljvoltaresVYVW5pukHxKqxNelJh9UcKg77TkwXTOmGi2QVc/0wRprmUCCKM xxfMQfDapFK0mDCOznrwwEIQJmebCaGtyjWFrKMrnMsHOsujmsm3MAAK72So+jg/3bgs qBqVxp2pPbj8btCtE9ndHzhIzR5EEgyocXc8QH+/n2eOKjFmICIU4A1haBMnhKEklk60 zDmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:to:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=uAeTDHAlfBO41xlqaqmaYiBXuMBQuraJsML/fZb6R2c=; b=ALdWpa9UsgViwqgmdQSEx2+yaILsrUR/2RigKgwUmcE72LQOH5Mssn3vH1nzkiinn/ 8sa4UR4CuxdPjqZayUR8ZC+uA7ONigFAgAQBHUhn6Iu4Zx4GvL4S9F6/as/757IF1bGM /dhsq/VZDeMhE82oJ8OEOAjkDVr9vweFLdOdZATKLzRXwviN96ab2VaMcRsk1197IwCA hyqvqdeAAsceW5Npjjh6JLqDHTjfQ4ogLCtyXAWJsBHNnDIKML5SAgnoSiRcbux96TER KmxmXts/hEcRM5GsR+3Xxa+meRY4qu+jL6qwvWCYdw5JP+np/QzyNTG2LGpL1DRDvUfd mD+A== X-Gm-Message-State: AD7BkJLQrEXztA6coTy6JK8LPUZBv4l/uo0khDJrL/McU5BeYtu9eLClpdfTTHEy0TG8mJKZ X-Received: by 10.28.217.146 with SMTP id q140mr20570815wmg.85.1457467864001; Tue, 08 Mar 2016 12:11:04 -0800 (PST) Received: from [192.168.0.44] (host86-147-84-80.range86-147.btcentralplus.com. [86.147.84.80]) by smtp.googlemail.com with ESMTPSA id jf6sm4569557wjb.2.2016.03.08.12.11.02 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 08 Mar 2016 12:11:02 -0800 (PST) To: "Barros Pena, Belen" , "toaster@yoctoproject.org" References: <1455618331-3332-1-git-send-email-michael.g.wood@intel.com> From: Michael Wood Message-ID: <56DF31D5.2060400@intel.com> Date: Tue, 8 Mar 2016 20:11:01 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.5.1 MIME-Version: 1.0 In-Reply-To: Subject: Re: [PATCH] toaster: models List only have the specified project's imported layers X-BeenThere: toaster@yoctoproject.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Web based interface for BitBake List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Mar 2016 20:11:08 -0000 Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 8bit 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" 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 >> --- >> 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