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 04CDA1382C5 for ; Thu, 25 Feb 2021 13:09:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 554F0E0929; Thu, 25 Feb 2021 13:09:36 +0000 (UTC) Received: from rs234.mailgun.us (rs234.mailgun.us [209.61.151.234]) (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 480E1E0929 for ; Thu, 25 Feb 2021 13:09:35 +0000 (UTC) DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=0xdc.io; q=dns/txt; s=smtp; t=1614258575; h=Content-Transfer-Encoding: MIME-Version: References: In-Reply-To: Message-Id: Date: Subject: Cc: To: From: Sender; bh=DrtjEG0iJDSchNEq7uCTxAYb19BETdbgPWqg5GTFgsw=; b=JPZbL9cr5EALt4gzxLzqAvft8P3TwRBE2TalFhtIgqyk1P2/5mFLYKABu3harIFBI0+TTS/5 9fV0KMKbwsaR8jRLO+JOtw+gg+5x23rAF186ZX/Tb4WXRLuZagSs837bat6SiNxeqUJvERJx M7pY2GRuhx/V7tTakByIE6vDNrY= X-Mailgun-Sending-Ip: 209.61.151.234 X-Mailgun-Sid: WyJiZmIxMyIsICJnZW50b28tY2F0YWx5c3RAbGlzdHMuZ2VudG9vLm9yZyIsICJmNjc0NGUiXQ== Received: from mail.0xdc.io (ip-54-37-0.eu [54.37.0.172]) by smtp-out-n02.prod.us-west-2.postgun.com with SMTP id 6037a189a27401dc6592e2f5 (version=TLS1.3, cipher=TLS_AES_128_GCM_SHA256); Thu, 25 Feb 2021 13:09:29 GMT Sender: gentoo.catalyst=xxoo.ws@0xdc.io Received: from dysnomia (0.0.3.9.8.9.8.e.d.9.5.a.e.2.7.6.0.a.4.7.9.0.c.0.0.b.8.0.1.0.0.2.ip6.arpa [IPv6:2001:8b0:c09:74a0:672e:a59d:e898:9300]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.0xdc.io (Postfix) with ESMTPSA id 872981023D8; Thu, 25 Feb 2021 13:09:39 +0000 (UTC) From: Daniel Cordero To: gentoo-catalyst@lists.gentoo.org Cc: Matt Turner Subject: [gentoo-catalyst] [PATCH] Fix specifying target_profiles in repo_name:path format Date: Thu, 25 Feb 2021 13:09:12 +0000 Message-Id: <20210225130912.48459-1-gentoo.catalyst@xxoo.ws> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210118202152.374078-7-mattst88@gentoo.org> References: <20210118202152.374078-7-mattst88@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Archives-Salt: 3a49f8d8-02b5-4822-aec3-02610ad45276 X-Archives-Hash: df25dddfdaafc284c0d8476c78743688 From: Daniel Cordero This fixes commit a500400592aaa309 Signed-off-by: Daniel Cordero --- 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): -- 2.26.2