[U-Boot] [PATCH] buildman: Correct toolchain download feature

[U-Boot] [PATCH] buildman: Correct toolchain download feature

[Simon Glass]

Commit d908898 updated the ScanPath() function but not its documentation
and not all its callers.

This breaks the toolchain check after it is downloaded. Fix it.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

 tools/buildman/toolchain.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/tools/buildman/toolchain.py b/tools/buildman/toolchain.py
index 537797a..051da11 100644
--- a/tools/buildman/toolchain.py
+++ b/tools/buildman/toolchain.py
@@ -465,11 +465,15 @@ class Toolchains:
         # Check that the toolchain works
         print 'Testing'
         dirpath = os.path.join(dest, path)
-        compiler_fname = self.ScanPath(dirpath, True)
-        if not compiler_fname:
+        compiler_fname_list = self.ScanPath(dirpath, True)
+        if not compiler_fname_list:
             print 'Could not locate C compiler - fetch failed.'
             return 1
-        toolchain = Toolchain(compiler_fname, True, True)
+        if len(compiler_fname_list) != 1:
+            print ('Internal error, ambiguous toolchains: %s' %
+                   (', '.join(compiler_fname)))
+            return 1
+        toolchain = Toolchain(compiler_fname_list[0], True, True)
 
         # Make sure that it will be found by buildman
         if not self.TestSettingsHasPath(dirpath):
-- 
2.2.0.rc0.207.ga3a616c

[U-Boot] [PATCH] buildman: Correct toolchain download feature

[Heiko Schocher]

Hello Simon,

Am 03.03.2015 01:05, schrieb Simon Glass:
> Commit d908898 updated the ScanPath() function but not its documentation
> and not all its callers.
>
> This breaks the toolchain check after it is downloaded. Fix it.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
>
>   tools/buildman/toolchain.py | 10 +++++++---
>   1 file changed, 7 insertions(+), 3 deletions(-)

Thanks!

Acked-by: Heiko Schocher <hs@denx.de>

bye,
Heiko
-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

[U-Boot] [PATCH] buildman: Correct toolchain download feature

[Simon Glass]

On 4 March 2015 at 23:15, Heiko Schocher <hs@denx.de> wrote:
> Hello Simon,
>
> Am 03.03.2015 01:05, schrieb Simon Glass:
>>
>> Commit d908898 updated the ScanPath() function but not its documentation
>> and not all its callers.
>>
>> This breaks the toolchain check after it is downloaded. Fix it.
>>
>> Signed-off-by: Simon Glass <sjg@chromium.org>
>> ---
>>
>>   tools/buildman/toolchain.py | 10 +++++++---
>>   1 file changed, 7 insertions(+), 3 deletions(-)
>
>
> Thanks!
>
> Acked-by: Heiko Schocher <hs@denx.de>

Applied to u-boot-x86/buildman.