From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CCA5C138359 for ; Mon, 31 Aug 2020 06:22:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 096AEE08C3; Mon, 31 Aug 2020 06:22:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E186CE08C3 for ; Mon, 31 Aug 2020 06:22:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 61FB9340E1C for ; Mon, 31 Aug 2020 06:22:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C662E31C for ; Mon, 31 Aug 2020 06:22:13 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1598830781.67423a3606db72f45ffe4dec325253a30508bd9d.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: lib/portage/tests/resolver/, lib/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: lib/_emerge/depgraph.py lib/portage/tests/resolver/test_slot_change_without_revbump.py lib/portage/tests/resolver/test_slot_conflict_rebuild.py X-VCS-Directories: lib/portage/tests/resolver/ lib/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 67423a3606db72f45ffe4dec325253a30508bd9d X-VCS-Branch: master Date: Mon, 31 Aug 2020 06:22:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1972dfcb-f97b-4b48-b2c0-7cedbca722e7 X-Archives-Hash: 85460e5c7888b201a5286945aceb9291 commit: 67423a3606db72f45ffe4dec325253a30508bd9d Author: Zac Medico gentoo org> AuthorDate: Sun Aug 30 23:21:25 2020 +0000 Commit: Zac Medico gentoo org> CommitDate: Sun Aug 30 23:39:41 2020 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=67423a36 dephgraph: Allow elimination of highest version after slot conflict (bug 439688) After a slot conflict occurs, allow the highest version to be eliminated from the graph when appropriate. This is needed for correct behavior in cases the highest version cannot be installed because an older version is required by some package. This reverts a change related to bug 531656 from commit a9064d08ef4c92a5d0d1bfb3dc8a01b7850812b0, and that change no longer appears to be necessary, since the unit tests related to bug 531656 now pass without it. Due to this change in slot conflict handling, the --changed-slot test case related to bug 456208 will now fail unless we use an @world update to trigger rebuilds, therefore fix it to do so. Bug: https://bugs.gentoo.org/439688 Signed-off-by: Zac Medico gentoo.org> lib/_emerge/depgraph.py | 9 --------- lib/portage/tests/resolver/test_slot_change_without_revbump.py | 4 ++-- lib/portage/tests/resolver/test_slot_conflict_rebuild.py | 3 --- 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/lib/_emerge/depgraph.py b/lib/_emerge/depgraph.py index e071be8df..3f864aefc 100644 --- a/lib/_emerge/depgraph.py +++ b/lib/_emerge/depgraph.py @@ -1501,15 +1501,6 @@ class depgraph: matched = [] for pkg in conflict: - if (pkg is highest_pkg and - not highest_pkg.installed and - inst_pkg is not None and - inst_pkg.sub_slot != highest_pkg.sub_slot and - not self._downgrade_probe(highest_pkg)): - # If an upgrade is desired, force the highest - # version into the graph (bug #531656). - non_matching_forced.add(highest_pkg) - if atom.match(pkg.with_use( self._pkg_use_enabled(pkg))) and \ not (is_arg_parent and pkg.installed): diff --git a/lib/portage/tests/resolver/test_slot_change_without_revbump.py b/lib/portage/tests/resolver/test_slot_change_without_revbump.py index 5cd8c53d1..e05705671 100644 --- a/lib/portage/tests/resolver/test_slot_change_without_revbump.py +++ b/lib/portage/tests/resolver/test_slot_change_without_revbump.py @@ -71,8 +71,8 @@ class SlotChangeWithoutRevBumpTestCase(TestCase): # Test --changed-slot ResolverPlaygroundTestCase( - ["app-arch/libarchive"], - options = {"--changed-slot": True, "--usepkg": True}, + ["@world"], + options = {"--changed-slot": True, "--usepkg": True, "--update": True, "--deep": True}, success = True, mergelist = ["app-arch/libarchive-3.1.1", "kde-base/ark-4.10.0"]), diff --git a/lib/portage/tests/resolver/test_slot_conflict_rebuild.py b/lib/portage/tests/resolver/test_slot_conflict_rebuild.py index b3bcf44d0..d650d42ae 100644 --- a/lib/portage/tests/resolver/test_slot_conflict_rebuild.py +++ b/lib/portage/tests/resolver/test_slot_conflict_rebuild.py @@ -454,10 +454,7 @@ class SlotConflictRebuildTestCase(TestCase): finally: playground.cleanup() -class SlotConflictRebuildGolangTestCase(TestCase): - def testSlotConflictRebuildGolang(self): - self.todo = True ebuilds = {