From: Simon Glass <sjg@chromium.org>
Date: Tue, 3 Mar 2015 00:05:15 +0000 (-0700)
Subject: buildman: Correct toolchain download feature
X-Git-Tag: v2015.04-rc4~60^2~1
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2a76a64981faf1cee84b6b7bdfa1894ba2e2e954;p=oweals%2Fu-boot.git

buildman: Correct toolchain download feature

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>
Acked-by: Heiko Schocher <hs@denx.de>
---

diff --git a/tools/buildman/toolchain.py b/tools/buildman/toolchain.py
index 537797ad53..051da11ef0 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):