| 1 |
Use real os.walk() when getting filenames for FlatLayout. Unlike |
| 2 |
the wrapped Portage module, it return str output for str path parameter, |
| 3 |
so we don't have to recode it back and forth. |
| 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 cedf12b19..be277f1a3 100644 |
| 12 |
--- a/lib/portage/package/ebuild/fetch.py |
| 13 |
+++ b/lib/portage/package/ebuild/fetch.py |
| 14 |
@@ -11,6 +11,7 @@ import io |
| 15 |
import itertools |
| 16 |
import json |
| 17 |
import logging |
| 18 |
+import os as real_os |
| 19 |
import random |
| 20 |
import re |
| 21 |
import stat |
| 22 |
@@ -270,7 +271,7 @@ class FlatLayout(object): |
| 23 |
return filename |
| 24 |
|
| 25 |
def get_filenames(self, distdir): |
| 26 |
- for dirpath, dirnames, filenames in os.walk(distdir, |
| 27 |
+ for dirpath, dirnames, filenames in real_os.walk(distdir, |
| 28 |
onerror=_raise_exc): |
| 29 |
return iter(filenames) |
| 30 |
|
| 31 |
-- |
| 32 |
2.23.0 |
Archives