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