[gentoo-catalyst] [PATCH] catalyst: Use correct arch setting for setarch testing

[gentoo-catalyst] [PATCH] catalyst: Use correct arch setting for setarch testing

[Matt Turner]

Previously we were testing against the 'host' or subarchitecture (e.g.
i486) instead of the architecture (e.g. x86). This manifests on x86
builds on x86_64; on ppc on ppc64 and sparc on sparc64 the arch and
subarch values happen to line up.

Fixes: cd58b37b ("catalyst: Access setarch data correctly")
Signed-off-by: Matt Turner <mattst88@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 5a3bd375..732c5939 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -129,7 +129,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', {}).get(host, {})
+                    setarch = arch_config.get('setarch', {}).get(arch, {})
                     break
                 else:
                     # Didn't find a matching subarchitecture, keep searching
-- 
2.37.4