1 |
commit: 57ce385e32e79b9d332fe1fdb3be50bdb07e7838 |
2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Aug 18 17:59:03 2022 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Aug 18 18:11:25 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=57ce385e |
7 |
|
8 |
dbapi: avoid iterating porttrees twice in _set_porttrees() |
9 |
|
10 |
If porttrees is a generator object, the second pass will fail. |
11 |
|
12 |
Bug: https://bugs.gentoo.org/865635 |
13 |
Fixes: 9e24d0143450628f334cdb62e579efafd1bfd2ba |
14 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
15 |
|
16 |
lib/portage/dbapi/porttree.py | 4 ++-- |
17 |
1 file changed, 2 insertions(+), 2 deletions(-) |
18 |
|
19 |
diff --git a/lib/portage/dbapi/porttree.py b/lib/portage/dbapi/porttree.py |
20 |
index cd919ba31..126e7161b 100644 |
21 |
--- a/lib/portage/dbapi/porttree.py |
22 |
+++ b/lib/portage/dbapi/porttree.py |
23 |
@@ -367,14 +367,14 @@ class portdbapi(dbapi): |
24 |
repo priority |
25 |
@type porttrees: list |
26 |
""" |
27 |
+ self._porttrees = tuple(porttrees) |
28 |
self._porttrees_repos = portage.OrderedDict( |
29 |
(repo.name, repo) |
30 |
for repo in ( |
31 |
self.repositories.get_repo_for_location(location) |
32 |
- for location in porttrees |
33 |
+ for location in self._porttrees |
34 |
) |
35 |
) |
36 |
- self._porttrees = tuple(porttrees) |
37 |
|
38 |
def _get_porttrees(self): |
39 |
return self._porttrees |