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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DD6B1158089 for ; Tue, 5 Sep 2023 01:44:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1BF9F2BC01F; Tue, 5 Sep 2023 01:44:20 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EFCB62BC01F for ; Tue, 5 Sep 2023 01:44:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C507F335CF4 for ; Tue, 5 Sep 2023 01:44:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A7F4710F6 for ; Tue, 5 Sep 2023 01:44:16 +0000 (UTC) From: "Andreas K. Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas K. Hüttel" Message-ID: <1693878227.1abd94188e9e9eecd5fe16de3aeaceebac1ec4e0.dilfridge@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: dilfridge X-VCS-Committer-Name: Andreas K. Hüttel X-VCS-Revision: 1abd94188e9e9eecd5fe16de3aeaceebac1ec4e0 X-VCS-Branch: master Date: Tue, 5 Sep 2023 01:44:16 +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: e14f9a91-a65f-4b44-b805-988e6b49e470 X-Archives-Hash: 2a35c82147f4ab5bd140e2df5fbd4382 commit: 1abd94188e9e9eecd5fe16de3aeaceebac1ec4e0 Author: Andreas K. Hüttel gentoo org> AuthorDate: Tue Sep 5 01:43:19 2023 +0000 Commit: Andreas K. Hüttel gentoo org> CommitDate: Tue Sep 5 01:43:47 2023 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=1abd9418 Turn binrepos.conf into a folder with gentoobinhost.conf inside Closes: https://bugs.gentoo.org/913660 Signed-off-by: Andreas K. Hüttel gentoo.org> catalyst/base/stagebase.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index fe307eab..3cbdf489 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -1200,9 +1200,11 @@ class StageBase(TargetBase, ClearBase, GenBase): # Write out binrepos.conf (for the chroot) binrpath = normpath(self.settings["chroot_path"] + self.settings["binrepos_conf"]) + Path(binrpath).mkdir(mode=0o755, parents=True, exist_ok=True) - with open(binrpath, "w") as myb: - log.notice("Writing the stage binrepos.conf to: %s" % binrpath) + binrfile = binrpath + "/gentoobinhost.conf" + with open(binrfile, "w") as myb: + log.notice("Writing the stage binrepo config to: %s" % binrfile) myb.write("# These settings were set by the catalyst build script " "that automatically\n# built this stage.\n") myb.write("# Please consider using a local mirror.\n\n") @@ -1211,8 +1213,6 @@ class StageBase(TargetBase, ClearBase, GenBase): myb.write("sync-uri = " + self.settings["binhost"] + \ self.settings["binrepo_path"] + "\n") - return - def fsscript(self): if "autoresume" in self.settings["options"] \ and self.resume.is_enabled("fsscript"):