commit: a2da08b6dfbfd2ef803aac6302f9de1f7c00a143
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 21 18:54:24 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jun 21 18:55:45 2023 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=a2da08b6
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 <AT> gentoo.org>
NEWS | 2 --
lib/_emerge/depgraph.py | 4 +++-
lib/portage/tests/resolver/test_slot_conflict_blocked_prune.py | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/NEWS b/NEWS
index cb68579f4..f2f716073 100644
--- a/NEWS
+++ b/NEWS
@@ -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"],
),
)
