From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0572E138350 for ; Thu, 23 Apr 2020 02:06:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 14259E0C04; Thu, 23 Apr 2020 02:06:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EAF4DE0C04 for ; Thu, 23 Apr 2020 02:06:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5CBA234F08B for ; Thu, 23 Apr 2020 02:06:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BE06D1E7 for ; Thu, 23 Apr 2020 02:06:45 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1587607511.992cf27d631b064a612c203169f1bc2446e6c6fc.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: catalyst/base/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/base/stagebase.py X-VCS-Directories: catalyst/base/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 992cf27d631b064a612c203169f1bc2446e6c6fc X-VCS-Branch: master Date: Thu, 23 Apr 2020 02:06:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: dda3f42c-c4c1-497c-8954-782f9b2f36ce X-Archives-Hash: f5a07fb78b878012d2c0034ee44110af commit: 992cf27d631b064a612c203169f1bc2446e6c6fc Author: Matt Turner gentoo org> AuthorDate: Thu Apr 23 02:05:11 2020 +0000 Commit: Matt Turner gentoo 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 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)