| 1 |
commit: b3a945a9dad98a6d2064a9120206ad3cc9d46675 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Feb 15 00:53:00 2020 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Feb 15 00:56:45 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=b3a945a9 |
| 7 |
|
| 8 |
_expand_set_args: un-reverse nested set traversal |
| 9 |
|
| 10 |
Un-reverse traversal order for @profile @selected @system. |
| 11 |
|
| 12 |
Bug: https://bugs.gentoo.org/649622 |
| 13 |
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> |
| 14 |
|
| 15 |
lib/_emerge/depgraph.py | 6 ++---- |
| 16 |
lib/portage/tests/resolver/test_or_choices.py | 4 ++-- |
| 17 |
2 files changed, 4 insertions(+), 6 deletions(-) |
| 18 |
|
| 19 |
diff --git a/lib/_emerge/depgraph.py b/lib/_emerge/depgraph.py |
| 20 |
index 27696ad40..a8ccd270d 100644 |
| 21 |
--- a/lib/_emerge/depgraph.py |
| 22 |
+++ b/lib/_emerge/depgraph.py |
| 23 |
@@ -2788,10 +2788,8 @@ class depgraph(object): |
| 24 |
|
| 25 |
# Traverse nested sets and add them to the stack |
| 26 |
# if they're not already in the graph. Also, graph |
| 27 |
- # edges between parent and nested sets. Traverse in |
| 28 |
- # sorted order for consistent results, using reverse |
| 29 |
- # sort since we pop these sets from a stack. |
| 30 |
- for token in sorted(arg.pset.getNonAtoms(), reverse=True): |
| 31 |
+ # edges between parent and nested sets. |
| 32 |
+ for token in sorted(arg.pset.getNonAtoms()): |
| 33 |
if not token.startswith(SETPREFIX): |
| 34 |
continue |
| 35 |
s = token[len(SETPREFIX):] |
| 36 |
|
| 37 |
diff --git a/lib/portage/tests/resolver/test_or_choices.py b/lib/portage/tests/resolver/test_or_choices.py |
| 38 |
index 5c6803784..f9d9687f3 100644 |
| 39 |
--- a/lib/portage/tests/resolver/test_or_choices.py |
| 40 |
+++ b/lib/portage/tests/resolver/test_or_choices.py |
| 41 |
@@ -676,7 +676,7 @@ class OrChoicesTestCase(TestCase): |
| 42 |
options = {'--update': True, '--deep': True}, |
| 43 |
success = True, |
| 44 |
mergelist=['virtual/w3m-0'], |
| 45 |
- graph_order=['@world', '@system', '@selected', '@profile', '[nomerge]app-misc/neofetch-6.1.0', '[nomerge]mail-client/neomutt-20191207', '[nomerge]www-client/lynx-2.9.0_pre4', '[nomerge]x11-base/xorg-server-1.20.7', '[nomerge]app-text/xmlto-0.0.28-r1', '[nomerge]www-client/w3m-0.5.3_p20190105', 'virtual/w3m-0'], |
| 46 |
+ graph_order=['@world', '@profile', '@selected', '@system', '[nomerge]app-misc/neofetch-6.1.0', '[nomerge]mail-client/neomutt-20191207', '[nomerge]www-client/lynx-2.9.0_pre4', '[nomerge]x11-base/xorg-server-1.20.7', '[nomerge]app-text/xmlto-0.0.28-r1', '[nomerge]www-client/w3m-0.5.3_p20190105', 'virtual/w3m-0'], |
| 47 |
), |
| 48 |
|
| 49 |
) |
| 50 |
@@ -715,7 +715,7 @@ class OrChoicesTestCase(TestCase): |
| 51 |
options={'--depclean': True}, |
| 52 |
success=True, |
| 53 |
cleanlist=[], |
| 54 |
- graph_order=['@world', '@system', '@selected', '@profile', '@____depclean_protected_set____', '[nomerge]app-misc/neofetch-6.1.0', '[nomerge]mail-client/neomutt-20191207', '[nomerge]www-client/lynx-2.9.0_pre4', '[nomerge]x11-base/xorg-server-1.20.7', '[nomerge]app-text/xmlto-0.0.28-r1', '[nomerge]www-client/w3m-0.5.3_p20190105', '[nomerge]virtual/w3m-0'], |
| 55 |
+ graph_order=['@world', '@____depclean_protected_set____', '@profile', '@selected', '@system', '[nomerge]app-misc/neofetch-6.1.0', '[nomerge]mail-client/neomutt-20191207', '[nomerge]www-client/lynx-2.9.0_pre4', '[nomerge]x11-base/xorg-server-1.20.7', '[nomerge]app-text/xmlto-0.0.28-r1', '[nomerge]www-client/w3m-0.5.3_p20190105', '[nomerge]virtual/w3m-0'], |
| 56 |
), |
| 57 |
|
| 58 |
) |
Archives