From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by yocto-www.yoctoproject.org (Postfix, from userid 118) id A6658E00A80; Wed, 29 Jul 2015 04:37:17 -0700 (PDT) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on yocto-www.yoctoproject.org X-Spam-Level: X-Spam-Status: No, score=-1.3 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_LOW, TRACKER_ID autolearn=no version=3.3.1 X-Spam-HAM-Report: * -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low * trust * [209.85.212.179 listed in list.dnswl.org] * 1.3 TRACKER_ID BODY: Incorporates a tracking ID number * -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% * [score: 0.0000] Received: from mail-wi0-f179.google.com (mail-wi0-f179.google.com [209.85.212.179]) by yocto-www.yoctoproject.org (Postfix) with ESMTP id 7949DE009EB for ; Wed, 29 Jul 2015 04:37:13 -0700 (PDT) Received: by wibxm9 with SMTP id xm9so196950975wib.0 for ; Wed, 29 Jul 2015 04:37:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:date:from:user-agent:mime-version:to :subject:references:in-reply-to:content-type :content-transfer-encoding; bh=xXHhkAeLzdkRnbqeJ667OMs7Wz4+Y55nRLVBDxcJxvM=; b=eLlIt4tuqTfiHOwFe78CU7CTxmyut79GyUUdaXT754chx1XfX3GAlJzLlOeSSmrKwI NsAEnNvyjMmSzF9HjiYiphUc4Cm9Tfv3u6ZOK7VrDn/tvej5irAavpDG/QF9klf5Yyi3 tP/MNdtLi7pI3+cFYV8o7aMHuhlUyConSdSMHIlDjMRx7XAtnbT2W3m9IpQmtUyCbjTn AcUBV4ws1N+TO47xFV0EEWk/WJz4aSc29DMZsS4Q93KwnDfI1fjMEvq7Ec8RyQYC7E4i NWGqZJhxGMXw2njr6cpRDpPxLVml+gXZdBNz6F5ovi5ihFFa1w98EFwAKKmF+J+nKBfE hqmA== X-Gm-Message-State: ALoCoQkgkco1wcw2ykwojPutZKckx7aZAxIXEUDUE4rVttrDHlvBs5U+SzRm6lWojNxZj+URyMBk X-Received: by 10.180.78.73 with SMTP id z9mr16616649wiw.64.1438169832756; Wed, 29 Jul 2015 04:37:12 -0700 (PDT) Received: from [192.168.2.72] ([83.217.123.106]) by smtp.googlemail.com with ESMTPSA id ft5sm23943236wib.4.2015.07.29.04.37.11 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 29 Jul 2015 04:37:11 -0700 (PDT) Message-ID: <55B8BAE6.8070703@intel.com> Date: Wed, 29 Jul 2015 12:37:10 +0100 From: Michael Wood User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.8.0 MIME-Version: 1.0 To: toaster@yoctoproject.org References: In-Reply-To: Subject: Re: [review-request] adamian/bug_fixes 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: Wed, 29 Jul 2015 11:37:17 -0000 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit On 27/07/15 13:08, Barros Pena, Belen wrote: > > On 27/07/2015 12:45, "Damian, Alexandru" > wrote: > >> Re-pushed the same branch with IN PROGRESS fixed applied to both build >> pages. > Now it seems to be working in both places. > > Thanks! > > Belén > >> >> Cheers, >> Alex >> >> >> On Mon, Jul 27, 2015 at 12:08 PM, Barros Pena, Belen >> wrote: >> >> Thanks for the poky-based branch Alex! A couple of comments below. >> >> On 24/07/2015 18:10, "toaster-bounces@yoctoproject.org on behalf of >> Damian, Alexandru" > alexandru.damian@intel.com> wrote: >> >>> >>> ​Hi, >>> >>> >>> This is a review request for adamian/bug_fixes >>> >> u >>> g_fixes>​ >>> >>> >>> ​It contains a previously submitted patchset, and a fix for #7995 >> >> bc4ea83f93657d876b43b751549735b683c33040 >> >> The builds in progress no longer show in the all builds page, but they >> still show in the project builds page. >> >> On the bright side, I know that because I can now reach the project builds >> page :) so the patch for 7995 works for me. >> >> Thanks! >> >> Belén >> >>> >>> Please review and submit when possible. >>> >>> >>> Cheers, >>> Alex​ >>> >>> >>> >>> >>> -- >>> Alex Damian >>> Yocto Project >>> >>> SSG / OTC >>> >>> >>> >> >> >> >> >> >> >> >> >> >> -- >> Alex Damian >> Yocto Project >> >> SSG / OTC >> >> >> Can you squash these two: ba72e1666796987bdec1bbf34d31a41ecf605936 and 9cce8032cbb70f0047f5819127c0c220963f2ce2 a125f3ab34a82eb684c46d5f01ee3544535ab5f4 diff --git a/lib/toaster/bldcontrol/management/commands/checksettings.py b/lib/toaster/bldcontrol/management/commands/checksettings.py index 3858b9e..b2631c4 100644 --- a/lib/toaster/bldcontrol/management/commands/checksettings.py +++ b/lib/toaster/bldcontrol/management/commands/checksettings.py @@ -99,10 +99,11 @@ class Command(NoArgsCommand): # find configuration files config_files = [] + selected_dirs = [] for dirname in self._recursive_list_directories(be.sourcedir,2): if os.path.exists(os.path.join(dirname, ".templateconf")): import subprocess - proc = subprocess.Popen('bash -c ". '+os.path.join(dirname, ".templateconf")+r'; echo \"$TEMPLATECONF\""', shell=True, stdout=subprocess.PIPE) + proc = subprocess.Popen('bash -c ". '+os.path.join(dirname, ".templateconf")+r'; echo \"\$TEMPLATECONF\""', shell=True, stdout=subprocess.PIPE) conffilepath, stderroroutput = proc.communicate() proc.wait() if proc.returncode != 0: @@ -114,6 +115,15 @@ class Command(NoArgsCommand): continue if os.path.exists(candidatefilepath): config_files.append(candidatefilepath) + selected_dirs.append(dirname) + + for dirname in self._recursive_list_directories(be.sourcedir,2): This for loop seems to be duplicated from the one above it checksettings.py (line 103 and 120) can they not be combined? However do we actually need to do all this searching? To simplify this couldn't we find "meta-yocto/conf/toasterconf.json" in the poky dir, if that doesn't exist then try the openembedded one, if that doesn't exist, ask? if people want to specify their own config we could have a -config option to bin/toaster. Thanks, Michael