| 1 |
commit: ab472882b13ebe7a8a649c723928250dc8aeb740 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Feb 10 05:04:20 2020 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 10 05:05:23 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=ab472882 |
| 7 |
|
| 8 |
depgraph: sort package set atoms for consistent results |
| 9 |
|
| 10 |
Traverse the unordered set returned from PackageSet.getAtoms() |
| 11 |
in sorted order, for more consistent results. |
| 12 |
|
| 13 |
Bug: https://bugs.gentoo.org/649622 |
| 14 |
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> |
| 15 |
|
| 16 |
lib/_emerge/depgraph.py | 6 +++--- |
| 17 |
1 file changed, 3 insertions(+), 3 deletions(-) |
| 18 |
|
| 19 |
diff --git a/lib/_emerge/depgraph.py b/lib/_emerge/depgraph.py |
| 20 |
index 1eaf20035..dd29b607c 100644 |
| 21 |
--- a/lib/_emerge/depgraph.py |
| 22 |
+++ b/lib/_emerge/depgraph.py |
| 23 |
@@ -4383,7 +4383,7 @@ class depgraph(object): |
| 24 |
args = self._dynamic_config._initial_arg_list[:] |
| 25 |
|
| 26 |
for arg in self._expand_set_args(args, add_to_digraph=True): |
| 27 |
- for atom in arg.pset.getAtoms(): |
| 28 |
+ for atom in sorted(arg.pset.getAtoms()): |
| 29 |
self._spinner_update() |
| 30 |
dep = Dependency(atom=atom, onlydeps=onlydeps, |
| 31 |
root=myroot, parent=arg) |
| 32 |
@@ -6975,7 +6975,7 @@ class depgraph(object): |
| 33 |
|
| 34 |
self._set_args(args) |
| 35 |
for arg in self._expand_set_args(args, add_to_digraph=True): |
| 36 |
- for atom in arg.pset.getAtoms(): |
| 37 |
+ for atom in sorted(arg.pset.getAtoms(), reverse=True): |
| 38 |
self._dynamic_config._dep_stack.append( |
| 39 |
Dependency(atom=atom, root=arg.root_config.root, |
| 40 |
parent=arg, depth=self._UNREACHABLE_DEPTH)) |
| 41 |
@@ -9366,7 +9366,7 @@ class depgraph(object): |
| 42 |
# added via _add_pkg() so that they are included in the |
| 43 |
# digraph (needed at least for --tree display). |
| 44 |
for arg in self._expand_set_args(args, add_to_digraph=True): |
| 45 |
- for atom in arg.pset.getAtoms(): |
| 46 |
+ for atom in sorted(arg.pset.getAtoms()): |
| 47 |
pkg, existing_node = self._select_package( |
| 48 |
arg.root_config.root, atom) |
| 49 |
if existing_node is None and \ |
Archives