diff options
| author |   Sam James <sam@gentoo.org> | 2023-06-21 19:54:24 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2023-06-21 19:55:45 +0100 |
| commit | a2da08b6dfbfd2ef803aac6302f9de1f7c00a143 (patch) | |
| tree | 9aa75eb06454a8d569c3a79ba9f4644f0cd26887 | |
| parent | tests: rename test_unecessary_slot_upgrade.py -> test_unnecessary_slot_upgrad... (diff) | |
| download | portage-a2da08b6dfbfd2ef803aac6302f9de1f7c00a143.tar.gz portage-a2da08b6dfbfd2ef803aac6302f9de1f7c00a143.tar.bz2 portage-a2da08b6dfbfd2ef803aac6302f9de1f7c00a143.zip | |
Revert "depgraph: Don't ignore downgrades as missed_updates"
This reverts commit 44afa8445dc46464200fe46c1e09e0c7475067bf.
This is just so we can make a release for the other fixes in master like
the Perl bits and keep a linear history.
Signed-off-by: Sam James <sam@gentoo.org>
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | lib/_emerge/depgraph.py | 4 | ||||
| -rw-r--r-- | lib/portage/tests/resolver/test_slot_conflict_blocked_prune.py | 2 |
3 files changed, 4 insertions, 4 deletions
@@ -5,8 +5,6 @@ Bug fixes: * Adjust write tests for DISTDIR and PORTAGE_TMPDIR to work with automount directories (bug #485100, bug #890812). -* depgraph: Don't ignore downgrades as missed_updates (bug #622270). - * depgraph: Do not allow slotted deps to be satisfied by wrong slots (bug #463976, bug #592880, bug #596664, bug #631490, bug #764365, bug #793992). diff --git a/lib/_emerge/depgraph.py b/lib/_emerge/depgraph.py index 28acfed9d..a36ab6351 100644 --- a/lib/_emerge/depgraph.py +++ b/lib/_emerge/depgraph.py @@ -1287,7 +1287,9 @@ class depgraph: pkg.root, pkg.slot_atom ): any_selected = True - if not chosen_pkg.installed and chosen_pkg.version == pkg.version: + if chosen_pkg > pkg or ( + not chosen_pkg.installed and chosen_pkg.version == pkg.version + ): missed_update = False break if any_selected and missed_update: diff --git a/lib/portage/tests/resolver/test_slot_conflict_blocked_prune.py b/lib/portage/tests/resolver/test_slot_conflict_blocked_prune.py index b23126d5f..14e98cd00 100644 --- a/lib/portage/tests/resolver/test_slot_conflict_blocked_prune.py +++ b/lib/portage/tests/resolver/test_slot_conflict_blocked_prune.py @@ -63,7 +63,7 @@ class SlotConflictBlockedPruneTestCase(TestCase): ["@world"], options={"--deep": True, "--update": True, "--verbose": True}, success=True, - mergelist=[], + mergelist=["x11-base/xwayland-23.1.1"], ), ) |