[Toaster] [review-request] adamian/bug_fixes

[Michael Wood]

On 27/07/15 13:08, Barros Pena, Belen wrote:
>
> On 27/07/2015 12:45, "Damian, Alexandru" <alexandru.damian at intel.com>
> 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
>> <belen.barros.pena at intel.com> wrote:
>>
>> Thanks for the poky-based branch Alex! A couple of comments below.
>>
>> On 24/07/2015 18:10, "toaster-bounces at yoctoproject.org on behalf of
>> Damian, Alexandru" <toaster-bounces at yoctoproject.org on behalf of
>> alexandru.damian at intel.com> wrote:
>>
>>>
>>> ​Hi,
>>>
>>>
>>> This is a review request for adamian/bug_fixes
>>> <https://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=adamian/b
>>> 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