commit: 17d64dba6363c15069f49bfe3dc2060a9811e288 Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Sat Mar 5 19:22:08 2022 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Sat Mar 5 19:23:39 2022 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=17d64dba
Revert "dep_zapdeps: avoid new slots when appropriate (bug 828136)" Revert the change from bug 828136, since it prevents solving of some blockers unless --update and --deep are specified as reported in bug 833014. Bug: https://bugs.gentoo.org/833014 Reverts: a7289ac0eaaa0d435bf6d9bfb2724a6b39adcbee Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> lib/portage/dep/dep_check.py | 6 +----- lib/portage/tests/resolver/test_installkernel.py | 20 +------------------- .../tests/resolver/test_unecessary_slot_upgrade.py | 11 ----------- 3 files changed, 2 insertions(+), 35 deletions(-) diff --git a/lib/portage/dep/dep_check.py b/lib/portage/dep/dep_check.py index 8ca4c0b9d..9fccda08b 100644 --- a/lib/portage/dep/dep_check.py +++ b/lib/portage/dep/dep_check.py @@ -376,7 +376,6 @@ def dep_zapdeps( # c) contains masked installed packages # d) is the first item - no_new_slots = [] preferred_in_graph = [] preferred_installed = preferred_in_graph preferred_any_slot = preferred_in_graph @@ -392,7 +391,6 @@ def dep_zapdeps( # unsat_use_* must come after preferred_non_installed # for correct ordering in cases like || ( foo[a] foo[b] ). choice_bins = ( - no_new_slots, preferred_in_graph, preferred_non_installed, unsat_use_in_graph, @@ -691,9 +689,7 @@ def dep_zapdeps( other.append(this_choice) else: if all_use_satisfied: - if new_slot_count == 0 and not want_update: - no_new_slots.append(this_choice) - elif all_in_graph: + if all_in_graph: preferred_in_graph.append(this_choice) elif all_installed: if all_installed_slots: diff --git a/lib/portage/tests/resolver/test_installkernel.py b/lib/portage/tests/resolver/test_installkernel.py index b73bbe5bb..5909b53aa 100644 --- a/lib/portage/tests/resolver/test_installkernel.py +++ b/lib/portage/tests/resolver/test_installkernel.py @@ -58,25 +58,8 @@ class InstallKernelTestCase(TestCase): ), ], ), - # Demonstrate bug 833014, where the calculation fails unless + # Test bug 833014, where the calculation failed unless # --update and --deep are specified. - ResolverPlaygroundTestCase( - [ - "sys-kernel/installkernel-systemd-boot", - "sys-kernel/gentoo-kernel-bin", - ], - ambiguous_merge_order=True, - success=False, - mergelist=[ - "sys-kernel/installkernel-systemd-boot-1", - "sys-kernel/gentoo-kernel-bin-5.15.23", - "virtual/dist-kernel-5.15.23", - ( - "!sys-kernel/installkernel-gentoo", - "!sys-kernel/installkernel-systemd-boot", - ), - ], - ), ResolverPlaygroundTestCase( [ "sys-kernel/installkernel-systemd-boot", @@ -84,7 +67,6 @@ class InstallKernelTestCase(TestCase): ], ambiguous_merge_order=True, success=True, - options={"--deep": True, "--update": True}, mergelist=[ "virtual/dist-kernel-5.15.23", "sys-kernel/installkernel-systemd-boot-1", diff --git a/lib/portage/tests/resolver/test_unecessary_slot_upgrade.py b/lib/portage/tests/resolver/test_unecessary_slot_upgrade.py index f8b8b346a..a89ebdb67 100644 --- a/lib/portage/tests/resolver/test_unecessary_slot_upgrade.py +++ b/lib/portage/tests/resolver/test_unecessary_slot_upgrade.py @@ -26,13 +26,6 @@ class UnnecessarySlotrUpgradeTestCase(TestCase): test_cases = ( # Test bug 828136, where an unnecessary python slot upgrade # was triggered. - ResolverPlaygroundTestCase( - [ - "app-misc/a", - ], - success=True, - mergelist=("app-misc/a-1",), - ), ResolverPlaygroundTestCase( [ "app-misc/a", @@ -42,10 +35,6 @@ class UnnecessarySlotrUpgradeTestCase(TestCase): "dev-lang/python-3.10", "app-misc/a-1", ), - options={ - "--deep": True, - "--update": True, - }, ), )
