1 |
commit: cd58b37bcd07433e93b80b4a93c9e79ec9395e26 |
2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri May 1 05:55:43 2020 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri May 1 05:55:43 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=cd58b37b |
7 |
|
8 |
catalyst: Access setarch data correctly |
9 |
|
10 |
This prevented the setarch data in the TOML files from being applied |
11 |
correctly. |
12 |
|
13 |
Fixes: b368f6aa5e29 (catalyst: Use arch data from TOML, not python |
14 |
modules) |
15 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
16 |
|
17 |
catalyst/base/stagebase.py | 2 +- |
18 |
1 file changed, 1 insertion(+), 1 deletion(-) |
19 |
|
20 |
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py |
21 |
index affdabbe..7c82029a 100644 |
22 |
--- a/catalyst/base/stagebase.py |
23 |
+++ b/catalyst/base/stagebase.py |
24 |
@@ -95,7 +95,7 @@ class StageBase(TargetBase, ClearBase, GenBase): |
25 |
# Search for a subarchitecture in each arch in the arch_config |
26 |
for arch in [x for x in arch_config if x.startswith(name) and host in arch_config[x]]: |
27 |
self.settings.update(arch_config[arch][host]) |
28 |
- setarch = arch_config.get('setarch', {}) |
29 |
+ setarch = arch_config.get('setarch', {}).get(host, {}) |
30 |
break |
31 |
else: |
32 |
# Didn't find a matching subarchitecture, keep searching |