commit: 992cf27d631b064a612c203169f1bc2446e6c6fc
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 23 02:05:11 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Apr 23 02:05:11 2020 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=992cf27d
catalyst: Fix Path() usage
When an Path argument has a leading /, all previous arguments are
ignored. This is surprising behavior to me...
Fixes: ddc1b50d47ff (catalyst: Simplify config_profile_link())
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
catalyst/base/stagebase.py | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 0531cf61..1c0d98c6 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -906,12 +906,10 @@ class StageBase(TargetBase, ClearBase, GenBase):
def config_profile_link(self):
log.info('Configuring profile link...')
- make_profile = Path(self.settings['chroot_path'],
- self.settings['port_conf'],
+ make_profile = Path(self.settings['chroot_path'] +
self.settings['port_conf'],
'make.profile')
make_profile.unlink()
- make_profile.symlink_to(Path('../..',
- self.settings['portdir'],
+ make_profile.symlink_to(Path('../..' + self.settings['portdir'],
'profiles',
self.settings['target_profile']),
target_is_directory=True)
