| 1 |
commit: 350b8f486b96871386d721e48e768a77a1c4b1a6 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Feb 11 20:39:37 2020 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Feb 11 20:48:56 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=350b8f48 |
| 7 |
|
| 8 |
depgraph: sort nested package set names for consistent results |
| 9 |
|
| 10 |
Traverse the unordered set returned from PackageSet.getNonAtoms() |
| 11 |
in sorted order, for more consistent results. Use a reverse sort |
| 12 |
since we pop these sets from a stack. |
| 13 |
|
| 14 |
Bug: https://bugs.gentoo.org/649622 |
| 15 |
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> |
| 16 |
|
| 17 |
lib/_emerge/depgraph.py | 6 ++++-- |
| 18 |
1 file changed, 4 insertions(+), 2 deletions(-) |
| 19 |
|
| 20 |
diff --git a/lib/_emerge/depgraph.py b/lib/_emerge/depgraph.py |
| 21 |
index dd29b607c..8e0d79e29 100644 |
| 22 |
--- a/lib/_emerge/depgraph.py |
| 23 |
+++ b/lib/_emerge/depgraph.py |
| 24 |
@@ -2788,8 +2788,10 @@ class depgraph(object): |
| 25 |
|
| 26 |
# Traverse nested sets and add them to the stack |
| 27 |
# if they're not already in the graph. Also, graph |
| 28 |
- # edges between parent and nested sets. |
| 29 |
- for token in arg.pset.getNonAtoms(): |
| 30 |
+ # edges between parent and nested sets. Traverse in |
| 31 |
+ # sorted order for consistent results, using reverse |
| 32 |
+ # sort since we pop these sets from a stack. |
| 33 |
+ for token in sorted(arg.pset.getNonAtoms(), reverse=True): |
| 34 |
if not token.startswith(SETPREFIX): |
| 35 |
continue |
| 36 |
s = token[len(SETPREFIX):] |
Archives