| 1 |
Revert the change from bug 828136, since it prevents solving |
| 2 |
of some blockers unless --update and --deep are specified as |
| 3 |
reported in bug 833014. |
| 4 |
|
| 5 |
Bug: https://bugs.gentoo.org/833014 |
| 6 |
Reverts: a7289ac0eaaa0d435bf6d9bfb2724a6b39adcbee |
| 7 |
Signed-off-by: Zac Medico <zmedico@g.o> |
| 8 |
--- |
| 9 |
lib/portage/dep/dep_check.py | 6 +----- |
| 10 |
.../tests/resolver/test_installkernel.py | 20 +------------------ |
| 11 |
.../resolver/test_unecessary_slot_upgrade.py | 11 ---------- |
| 12 |
3 files changed, 2 insertions(+), 35 deletions(-) |
| 13 |
|
| 14 |
diff --git a/lib/portage/dep/dep_check.py b/lib/portage/dep/dep_check.py |
| 15 |
index 8ca4c0b9d..9fccda08b 100644 |
| 16 |
--- a/lib/portage/dep/dep_check.py |
| 17 |
+++ b/lib/portage/dep/dep_check.py |
| 18 |
@@ -376,7 +376,6 @@ def dep_zapdeps( |
| 19 |
# c) contains masked installed packages |
| 20 |
# d) is the first item |
| 21 |
|
| 22 |
- no_new_slots = [] |
| 23 |
preferred_in_graph = [] |
| 24 |
preferred_installed = preferred_in_graph |
| 25 |
preferred_any_slot = preferred_in_graph |
| 26 |
@@ -392,7 +391,6 @@ def dep_zapdeps( |
| 27 |
# unsat_use_* must come after preferred_non_installed |
| 28 |
# for correct ordering in cases like || ( foo[a] foo[b] ). |
| 29 |
choice_bins = ( |
| 30 |
- no_new_slots, |
| 31 |
preferred_in_graph, |
| 32 |
preferred_non_installed, |
| 33 |
unsat_use_in_graph, |
| 34 |
@@ -691,9 +689,7 @@ def dep_zapdeps( |
| 35 |
other.append(this_choice) |
| 36 |
else: |
| 37 |
if all_use_satisfied: |
| 38 |
- if new_slot_count == 0 and not want_update: |
| 39 |
- no_new_slots.append(this_choice) |
| 40 |
- elif all_in_graph: |
| 41 |
+ if all_in_graph: |
| 42 |
preferred_in_graph.append(this_choice) |
| 43 |
elif all_installed: |
| 44 |
if all_installed_slots: |
| 45 |
diff --git a/lib/portage/tests/resolver/test_installkernel.py b/lib/portage/tests/resolver/test_installkernel.py |
| 46 |
index b73bbe5bb..5909b53aa 100644 |
| 47 |
--- a/lib/portage/tests/resolver/test_installkernel.py |
| 48 |
+++ b/lib/portage/tests/resolver/test_installkernel.py |
| 49 |
@@ -58,25 +58,8 @@ class InstallKernelTestCase(TestCase): |
| 50 |
), |
| 51 |
], |
| 52 |
), |
| 53 |
- # Demonstrate bug 833014, where the calculation fails unless |
| 54 |
+ # Test bug 833014, where the calculation failed unless |
| 55 |
# --update and --deep are specified. |
| 56 |
- ResolverPlaygroundTestCase( |
| 57 |
- [ |
| 58 |
- "sys-kernel/installkernel-systemd-boot", |
| 59 |
- "sys-kernel/gentoo-kernel-bin", |
| 60 |
- ], |
| 61 |
- ambiguous_merge_order=True, |
| 62 |
- success=False, |
| 63 |
- mergelist=[ |
| 64 |
- "sys-kernel/installkernel-systemd-boot-1", |
| 65 |
- "sys-kernel/gentoo-kernel-bin-5.15.23", |
| 66 |
- "virtual/dist-kernel-5.15.23", |
| 67 |
- ( |
| 68 |
- "!sys-kernel/installkernel-gentoo", |
| 69 |
- "!sys-kernel/installkernel-systemd-boot", |
| 70 |
- ), |
| 71 |
- ], |
| 72 |
- ), |
| 73 |
ResolverPlaygroundTestCase( |
| 74 |
[ |
| 75 |
"sys-kernel/installkernel-systemd-boot", |
| 76 |
@@ -84,7 +67,6 @@ class InstallKernelTestCase(TestCase): |
| 77 |
], |
| 78 |
ambiguous_merge_order=True, |
| 79 |
success=True, |
| 80 |
- options={"--deep": True, "--update": True}, |
| 81 |
mergelist=[ |
| 82 |
"virtual/dist-kernel-5.15.23", |
| 83 |
"sys-kernel/installkernel-systemd-boot-1", |
| 84 |
diff --git a/lib/portage/tests/resolver/test_unecessary_slot_upgrade.py b/lib/portage/tests/resolver/test_unecessary_slot_upgrade.py |
| 85 |
index f8b8b346a..a89ebdb67 100644 |
| 86 |
--- a/lib/portage/tests/resolver/test_unecessary_slot_upgrade.py |
| 87 |
+++ b/lib/portage/tests/resolver/test_unecessary_slot_upgrade.py |
| 88 |
@@ -26,13 +26,6 @@ class UnnecessarySlotrUpgradeTestCase(TestCase): |
| 89 |
test_cases = ( |
| 90 |
# Test bug 828136, where an unnecessary python slot upgrade |
| 91 |
# was triggered. |
| 92 |
- ResolverPlaygroundTestCase( |
| 93 |
- [ |
| 94 |
- "app-misc/a", |
| 95 |
- ], |
| 96 |
- success=True, |
| 97 |
- mergelist=("app-misc/a-1",), |
| 98 |
- ), |
| 99 |
ResolverPlaygroundTestCase( |
| 100 |
[ |
| 101 |
"app-misc/a", |
| 102 |
@@ -42,10 +35,6 @@ class UnnecessarySlotrUpgradeTestCase(TestCase): |
| 103 |
"dev-lang/python-3.10", |
| 104 |
"app-misc/a-1", |
| 105 |
), |
| 106 |
- options={ |
| 107 |
- "--deep": True, |
| 108 |
- "--update": True, |
| 109 |
- }, |
| 110 |
), |
| 111 |
) |
| 112 |
|
| 113 |
-- |
| 114 |
2.34.1 |
Archives