From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 16FF1138350 for ; Fri, 1 May 2020 05:57:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3FD33E0BAA; Fri, 1 May 2020 05:57:36 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 27ADDE0BAA for ; Fri, 1 May 2020 05:57:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C0ED734EFA4 for ; Fri, 1 May 2020 05:57:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AA1F61DD for ; Fri, 1 May 2020 05:57:32 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1588312543.cd58b37bcd07433e93b80b4a93c9e79ec9395e26.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: catalyst/base/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/base/stagebase.py X-VCS-Directories: catalyst/base/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: cd58b37bcd07433e93b80b4a93c9e79ec9395e26 X-VCS-Branch: master Date: Fri, 1 May 2020 05:57:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8e369135-9a9a-4b45-af3f-28b2ccf2dab2 X-Archives-Hash: 9967bcc69cecf17bff934b2805dfbd29 commit: cd58b37bcd07433e93b80b4a93c9e79ec9395e26 Author: Matt Turner gentoo org> AuthorDate: Fri May 1 05:55:43 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Fri May 1 05:55:43 2020 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=cd58b37b catalyst: Access setarch data correctly This prevented the setarch data in the TOML files from being applied correctly. Fixes: b368f6aa5e29 (catalyst: Use arch data from TOML, not python modules) Signed-off-by: Matt Turner gentoo.org> catalyst/base/stagebase.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index affdabbe..7c82029a 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -95,7 +95,7 @@ class StageBase(TargetBase, ClearBase, GenBase): # Search for a subarchitecture in each arch in the arch_config for arch in [x for x in arch_config if x.startswith(name) and host in arch_config[x]]: self.settings.update(arch_config[arch][host]) - setarch = arch_config.get('setarch', {}) + setarch = arch_config.get('setarch', {}).get(host, {}) break else: # Didn't find a matching subarchitecture, keep searching