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 A784815808B for ; Sat, 9 Apr 2022 04:32:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C9EB4E08FC; Sat, 9 Apr 2022 04:32:22 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A9352E08FC for ; Sat, 9 Apr 2022 04:32:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 B9B3034139E for ; Sat, 9 Apr 2022 04:32:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5CF83250 for ; Sat, 9 Apr 2022 04:32:20 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1649478732.b4ca7c5802aafab54ca163c8e59ac3d2222e3084.sam@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: lib/portage/ X-VCS-Repository: proj/portage X-VCS-Files: lib/portage/manifest.py X-VCS-Directories: lib/portage/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: b4ca7c5802aafab54ca163c8e59ac3d2222e3084 X-VCS-Branch: master Date: Sat, 9 Apr 2022 04:32:20 +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: dc290742-a01f-4262-9f81-1f8643ccd42e X-Archives-Hash: b8dfaea34515ea82ba92e5a1de6d4a23 commit: b4ca7c5802aafab54ca163c8e59ac3d2222e3084 Author: Kenneth Raplee kennethraplee com> AuthorDate: Sat Apr 9 01:42:32 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sat Apr 9 04:32:12 2022 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=b4ca7c58 manifest: fix thick manifest generation Closes: https://bugs.gentoo.org/837326 Closes: https://bugs.gentoo.org/837323 Signed-off-by: Kenneth Raplee kennethraplee.com> Signed-off-by: Sam James gentoo.org> lib/portage/manifest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/portage/manifest.py b/lib/portage/manifest.py index eb3695669..a5b26c130 100644 --- a/lib/portage/manifest.py +++ b/lib/portage/manifest.py @@ -641,7 +641,7 @@ class Manifest: recursive_files = [] pkgdir = self.pkgdir - cut_len = len(os.path.join(pkgdir, "files", os.sep)) + cut_len = len(os.path.join(pkgdir, f"files{os.sep}")) for parentdir, dirs, files in os.walk(os.path.join(pkgdir, "files")): for f in files: try: