Gentoo Archives: gentoo-catalyst

From: Daniel Cordero <gentoo.catalyst@××××.ws>
To: gentoo-catalyst@l.g.o
Cc: Matt Turner <mattst88@g.o>
Subject: [gentoo-catalyst] [PATCH] Fix specifying target_profiles in repo_name:path format
Date: Thu, 25 Feb 2021 13:09:37
Message-Id: 20210225130912.48459-1-gentoo.catalyst@xxoo.ws
In Reply to: [gentoo-catalyst] [PATCH 07/11] catalyst: Call config_profile_link for all targets by Matt Turner
1 From: Daniel Cordero <catalyst@××××.io>
2
3 This fixes commit a500400592aaa309
4
5 Signed-off-by: Daniel Cordero <catalyst@××××.io>
6 ---
7 catalyst/base/stagebase.py | 9 +++++++--
8 1 file changed, 7 insertions(+), 2 deletions(-)
9
10 diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
11 index a4da7eb3..448d6265 100644
12 --- a/catalyst/base/stagebase.py
13 +++ b/catalyst/base/stagebase.py
14 @@ -814,10 +814,15 @@ class StageBase(TargetBase, ClearBase, GenBase):
15 make_profile = Path(self.settings['chroot_path'] + self.settings['port_conf'],
16 'make.profile')
17 make_profile.unlink(missing_ok=True)
18 + try:
19 + repo_name, target_profile = self.settings['target_profile'].split(":", 1)
20 + except ValueError:
21 + repo_name = self.settings['repo_name']
22 + target_profile = self.settings['target_profile']
23 make_profile.symlink_to(Path('../..' + self.settings['repo_basedir'],
24 - self.settings['repo_name'],
25 + repo_name,
26 'profiles',
27 - self.settings['target_profile']),
28 + target_profile),
29 target_is_directory=True)
30
31 def setup_confdir(self):
32 --
33 2.26.2

Replies