From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by yocto-www.yoctoproject.org (Postfix, from userid 118) id 9FFC0E00B3A; Thu, 3 Mar 2016 07:10:18 -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: * -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 * -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] 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 3327BE009C3 for ; Thu, 3 Mar 2016 07:10:14 -0800 (PST) Received: by mail-wm0-f45.google.com with SMTP id l68so135596762wml.0 for ; Thu, 03 Mar 2016 07:10:14 -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=uiAnP6niYea+MY4E7JoO5z1lqDoePzYMMb0RcWJCdrw=; b=gnXdpSzSykrQ+zG6PDVXU5RwMAF6eqYcSAlrQef2ua7tb7uXk+dCWbwMreukmIB1XG ++si03NloEmBxEZwEEpsd0C1G+VxeVJAds3uarCQHBXzduSGx+yj1lTVbZIM/oc/aBrx BgzwB672UHxrgZHyB2xx3wed7b3qcg+Tet3HV848pb+Z6an++UOCVtglIAt/yA4AZQQy Jk5AGHWrUg6i4x7PrSm9QkeXIhowagO0jHhCkEwy6Tk12GKfbWkCWPm6LGu2ikLaWiDM Uhlzzr3r4rsC4u0oGCrVtAT5zZ4YQ+6qapiiV0H3CKgM1ueoPAxNqkNpzJD35VXk2x/T cezA== 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=uiAnP6niYea+MY4E7JoO5z1lqDoePzYMMb0RcWJCdrw=; b=G1u2BDj68J4aRe5zZYbaED8yzesiI2bdEyePy4ctMjBX6Swdv0XZhs7dZH5vkvteSg q+AHBeDRqXhArI2HA/2JUnAdSv6o6PiZRp5X4ExrgGD0YsPCCskCqxp22QDZn9DydkUt Lesf64by9hWfxPi+yZBeb0UHLU8q0DbZro05dStRDgnlPTlwwCH2CNuFvuj+LKqnohhX K4h4HiEBsz57AjFKbd+teT0I4CE7kvDpLBZNJOTmkKl0nAE/mZjuoFhIDC0HkfjA7D87 R8iH2nJLg1Nr+YJR9MP0Qvi5Kt7GlY2MBk086QIEswUekURU0uKpx4Ym7IvJ/KweUbaX HjOg== X-Gm-Message-State: AD7BkJKIaRWoa+O/0AetluYajaQJawttb2CeFhRCtNAmSDlwy3gncZwJASH2Kg9euJu4CGX/ X-Received: by 10.194.123.102 with SMTP id lz6mr3965244wjb.2.1457017813588; Thu, 03 Mar 2016 07:10:13 -0800 (PST) Received: from [192.168.2.24] ([83.217.123.106]) by smtp.googlemail.com with ESMTPSA id ls5sm40901949wjb.33.2016.03.03.07.10.12 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 03 Mar 2016 07:10:12 -0800 (PST) To: Dave Lerner , toaster@yoctoproject.org, belen.barros.pena@linux.intel.com References: <1456781179-31194-1-git-send-email-dave.lerner@windriver.com> <1456781179-31194-2-git-send-email-dave.lerner@windriver.com> From: Michael Wood Message-ID: <56D853D3.8020107@intel.com> Date: Thu, 3 Mar 2016 15:10:11 +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: <1456781179-31194-2-git-send-email-dave.lerner@windriver.com> Subject: Re: [PATCH 1/1] toaster: fixup dependency excludes for customimage 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: Thu, 03 Mar 2016 15:10:18 -0000 Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Thanks for the patch. Just a small fix needed here. On 29/02/16 21:26, Dave Lerner wrote: > [YOCTO #9156] > > For a customized image when adding a dependent package X that depends on > dependency package Y, in addition to adding X to appends_set and Y to > includes_set, make sure that Y is no longer in the excludes_set. Y may > have been added to the excludes_set by a prior package removal. > > Signed-off-by: Dave Lerner > --- > bitbake/lib/toaster/toastergui/views.py | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py > index 28b03d3..4670139 100755 > --- a/bitbake/lib/toaster/toastergui/views.py > +++ b/bitbake/lib/toaster/toastergui/views.py > @@ -2653,6 +2653,13 @@ if True: > name=dep.depends_on.name) > > recipe.includes_set.add(cust_package) > + try: > + # when adding the pre-requisite package make sure it's not in the > + # excluded list from a prior removal. > + recipe.excludes_set.remove(cust_package) > + except Package.DoesNotExist: > + # Don't care if the package had never been excluded > + return {"error": "ok"} We don't want to /return/ as we would end up exiting the loop on the first package that causes the DoesNotExist exception a /pass/ would be fine here. > except: > logger.warning("Could not add package's suggested" > "dependencies to the list")