Gentoo Archives: gentoo-portage-dev

From: "Michał Górny" <mgorny@g.o>
To: gentoo-portage-dev@l.g.o
Cc: "Michał Górny" <mgorny@g.o>
Subject: [gentoo-portage-dev] [PATCH] fetch: Make FlatLayout.get_filenames() not return directories
Date: Sun, 13 Oct 2019 11:57:31
Message-Id: 20191013115701.44116-1-mgorny@gentoo.org
1 Stop returning directories from FlatLayout.get_filenames(). This causes
2 emirrordist to wrongly presume directories created by new layout
3 to be distfiles, and causes some noisy errors.
4
5 Signed-off-by: Michał Górny <mgorny@g.o>
6 ---
7 lib/portage/package/ebuild/fetch.py | 3 ++-
8 1 file changed, 2 insertions(+), 1 deletion(-)
9
10 diff --git a/lib/portage/package/ebuild/fetch.py b/lib/portage/package/ebuild/fetch.py
11 index 5d0bc7355..793402137 100644
12 --- a/lib/portage/package/ebuild/fetch.py
13 +++ b/lib/portage/package/ebuild/fetch.py
14 @@ -269,7 +269,8 @@ class FlatLayout(object):
15 return filename
16
17 def get_filenames(self, distdir):
18 - return iter(os.listdir(distdir))
19 + for dirpath, dirnames, filenames in os.walk(distdir):
20 + return iter(filenames)
21
22 @staticmethod
23 def verify_args(args):
24 --
25 2.23.0

Replies