From 7e92e46e630cd7ee60e045e806356fa26567c064 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Wed, 27 Jul 2016 20:33:04 -0600 Subject: [PATCH] buildman: Drop the toolchain error when downloading toolchains It doesn't make sense to complain about missing toolchains when the --fetch-arch option is being used. The user is presumably aware that there is a toolchain problem and is actively correcting it by running with this option. Refactor the code to avoid printing this confusing message. Signed-off-by: Simon Glass --- tools/buildman/control.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/tools/buildman/control.py b/tools/buildman/control.py index 46053d8db3..b86d7b3c1f 100644 --- a/tools/buildman/control.py +++ b/tools/buildman/control.py @@ -111,14 +111,9 @@ def DoBuildman(options, args, toolchains=None, make_func=None, boards=None, options.git_dir = os.path.join(options.git, '.git') - if not toolchains: + no_toolchains = toolchains is None + if no_toolchains: toolchains = toolchain.Toolchains() - toolchains.GetSettings() - toolchains.Scan(options.list_tool_chains) - if options.list_tool_chains: - toolchains.List() - print - return 0 if options.fetch_arch: if options.fetch_arch == 'list': @@ -139,6 +134,14 @@ def DoBuildman(options, args, toolchains=None, make_func=None, boards=None, return ret return 0 + if no_toolchains: + toolchains.GetSettings() + toolchains.Scan(options.list_tool_chains) + if options.list_tool_chains: + toolchains.List() + print + return 0 + # Work out how many commits to build. We want to build everything on the # branch. We also build the upstream commit as a control so we can see # problems introduced by the first commit on the branch. -- 2.39.5