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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id ABD93159C96 for ; Tue, 30 Jul 2024 11:06:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A9D8EE29F1; Tue, 30 Jul 2024 11:06:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 7DE57E29F1 for ; Tue, 30 Jul 2024 11:06:22 +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 36C7C335D21 for ; Tue, 30 Jul 2024 11:06:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 77C271E65 for ; Tue, 30 Jul 2024 11:06:19 +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: <1722284990.8339543d77edee063bdd1288cb0e24b77865b437.dilfridge@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: catalyst/targets/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/targets/stage1.py X-VCS-Directories: catalyst/targets/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas K. Hüttel X-VCS-Revision: 8339543d77edee063bdd1288cb0e24b77865b437 X-VCS-Branch: master Date: Tue, 30 Jul 2024 11:06:19 +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: e7df3c0c-efa3-4697-81f9-5b51bd58e727 X-Archives-Hash: 91bcbb7468f8de7763f8af49951e0235 commit: 8339543d77edee063bdd1288cb0e24b77865b437 Author: Andreas K. Hüttel gentoo org> AuthorDate: Mon Jul 29 20:29:50 2024 +0000 Commit: Andreas K. Hüttel gentoo org> CommitDate: Mon Jul 29 20:29:50 2024 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=8339543d targets: improve path concatenation Signed-off-by: Andreas K. Hüttel gentoo.org> catalyst/targets/stage1.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/catalyst/targets/stage1.py b/catalyst/targets/stage1.py index 42931749..593509e4 100644 --- a/catalyst/targets/stage1.py +++ b/catalyst/targets/stage1.py @@ -33,7 +33,7 @@ class stage1(StageBase): self.mount[mount_id] = { 'enable': True, 'source': path, - 'target': Path(normpath("/tmp/stage1root") + "/" + str(self.get_repo_location(name))) + 'target': normpath("/tmp/stage1root") / self.get_repo_location(name) } def set_root_path(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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DAE21159C9B for ; Fri, 9 Aug 2024 19:34:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0F1FFE2B86; Fri, 9 Aug 2024 19:34:11 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DDD33E2B84 for ; Fri, 9 Aug 2024 19:34:10 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 256993430F5 for ; Fri, 9 Aug 2024 19:34:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 830821ED5 for ; Fri, 9 Aug 2024 19:34:07 +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: <1722284990.8339543d77edee063bdd1288cb0e24b77865b437.dilfridge@gentoo> Subject: [gentoo-commits] proj/catalyst:dilfridge/qcow2 commit in: catalyst/targets/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/targets/stage1.py X-VCS-Directories: catalyst/targets/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas K. Hüttel X-VCS-Revision: 8339543d77edee063bdd1288cb0e24b77865b437 X-VCS-Branch: dilfridge/qcow2 Date: Fri, 9 Aug 2024 19:34:07 +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: b4a4dcf7-8804-468d-8456-fa08caac1fdd X-Archives-Hash: 6d6e13ffa7646ef52baeb9a73d7b868e Message-ID: <20240809193407._OL1sTmiBjT3PN3A0glkcro8alpmnstWmD0-UNUISsI@z> commit: 8339543d77edee063bdd1288cb0e24b77865b437 Author: Andreas K. Hüttel gentoo org> AuthorDate: Mon Jul 29 20:29:50 2024 +0000 Commit: Andreas K. Hüttel gentoo org> CommitDate: Mon Jul 29 20:29:50 2024 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=8339543d targets: improve path concatenation Signed-off-by: Andreas K. Hüttel gentoo.org> catalyst/targets/stage1.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/catalyst/targets/stage1.py b/catalyst/targets/stage1.py index 42931749..593509e4 100644 --- a/catalyst/targets/stage1.py +++ b/catalyst/targets/stage1.py @@ -33,7 +33,7 @@ class stage1(StageBase): self.mount[mount_id] = { 'enable': True, 'source': path, - 'target': Path(normpath("/tmp/stage1root") + "/" + str(self.get_repo_location(name))) + 'target': normpath("/tmp/stage1root") / self.get_repo_location(name) } def set_root_path(self):