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 E0B8F1382C5 for ; Sat, 6 Mar 2021 16:58:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2E7EFE08A0; Sat, 6 Mar 2021 16:58:08 +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 11F76E08A0 for ; Sat, 6 Mar 2021 16:58:08 +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 D42F8340E86 for ; Sat, 6 Mar 2021 16:58:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 34BBB53 for ; Sat, 6 Mar 2021 16:58:05 +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: <1615049829.71037a931ff23141875c40d37605e8614a31077e.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: 71037a931ff23141875c40d37605e8614a31077e X-VCS-Branch: master Date: Sat, 6 Mar 2021 16:58:05 +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: 3e6744e4-30c2-445c-991a-8fbb3f55949b X-Archives-Hash: 37998cefa055c7963057570c40445084 commit: 71037a931ff23141875c40d37605e8614a31077e Author: Daniel Cordero 0xdc io> AuthorDate: Thu Feb 25 13:09:12 2021 +0000 Commit: Matt Turner gentoo 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 0xdc.io> Signed-off-by: Matt Turner 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): 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 D5AF21382C5 for ; Thu, 10 Jun 2021 00:48:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 18D8EE0903; Thu, 10 Jun 2021 00:48:47 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 03E82E0900 for ; Thu, 10 Jun 2021 00:48:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 EC88D340C19 for ; Thu, 10 Jun 2021 00:48:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 64BFA7AE for ; Thu, 10 Jun 2021 00:48:43 +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: <1615049829.71037a931ff23141875c40d37605e8614a31077e.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:wip/mattst88 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: 71037a931ff23141875c40d37605e8614a31077e X-VCS-Branch: wip/mattst88 Date: Thu, 10 Jun 2021 00:48:43 +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: 1a8fa151-5cff-48ad-9101-df6b27fa5fab X-Archives-Hash: 8dedfe8757dfea20a1ce8d7cea900302 Message-ID: <20210610004843.4DTHMeYb1fOOUpDmNmi2xCuzxoKuZ8BHFJUbXftHVow@z> commit: 71037a931ff23141875c40d37605e8614a31077e Author: Daniel Cordero 0xdc io> AuthorDate: Thu Feb 25 13:09:12 2021 +0000 Commit: Matt Turner gentoo 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 0xdc.io> Signed-off-by: Matt Turner 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):