Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:master commit in: lib/portage/
Date: Sat, 09 Apr 2022 04:32:23
Message-Id: 1649478732.b4ca7c5802aafab54ca163c8e59ac3d2222e3084.sam@gentoo
1 commit: b4ca7c5802aafab54ca163c8e59ac3d2222e3084
2 Author: Kenneth Raplee <kenrap <AT> kennethraplee <DOT> com>
3 AuthorDate: Sat Apr 9 01:42:32 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sat Apr 9 04:32:12 2022 +0000
6 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=b4ca7c58
7
8 manifest: fix thick manifest generation
9
10 Closes: https://bugs.gentoo.org/837326
11 Closes: https://bugs.gentoo.org/837323
12 Signed-off-by: Kenneth Raplee <kenrap <AT> kennethraplee.com>
13 Signed-off-by: Sam James <sam <AT> gentoo.org>
14
15 lib/portage/manifest.py | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
18 diff --git a/lib/portage/manifest.py b/lib/portage/manifest.py
19 index eb3695669..a5b26c130 100644
20 --- a/lib/portage/manifest.py
21 +++ b/lib/portage/manifest.py
22 @@ -641,7 +641,7 @@ class Manifest:
23 recursive_files = []
24
25 pkgdir = self.pkgdir
26 - cut_len = len(os.path.join(pkgdir, "files", os.sep))
27 + cut_len = len(os.path.join(pkgdir, f"files{os.sep}"))
28 for parentdir, dirs, files in os.walk(os.path.join(pkgdir, "files")):
29 for f in files:
30 try: