commit: 71037a931ff23141875c40d37605e8614a31077e Author: Daniel Cordero <catalyst <AT> 0xdc <DOT> io> AuthorDate: Thu Feb 25 13:09:12 2021 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Sat Mar 6 16:57:09 2021 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=71037a93
catalyst: Handle specifying target_profiles in repo_name:path format Fixes: a5004005 ("catalyst: Call config_profile_link for all targets") Signed-off-by: Daniel Cordero <catalyst <AT> 0xdc.io> Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> catalyst/base/stagebase.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index a4da7eb3..448d6265 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -814,10 +814,15 @@ class StageBase(TargetBase, ClearBase, GenBase): make_profile = Path(self.settings['chroot_path'] + self.settings['port_conf'], 'make.profile') make_profile.unlink(missing_ok=True) + try: + repo_name, target_profile = self.settings['target_profile'].split(":", 1) + except ValueError: + repo_name = self.settings['repo_name'] + target_profile = self.settings['target_profile'] make_profile.symlink_to(Path('../..' + self.settings['repo_basedir'], - self.settings['repo_name'], + repo_name, 'profiles', - self.settings['target_profile']), + target_profile), target_is_directory=True) def setup_confdir(self):