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 43C7813933E for ; Mon, 5 Jul 2021 08:40:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5E30EE0A4F; Mon, 5 Jul 2021 08:40:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 43AD7E0A4F for ; Mon, 5 Jul 2021 08:40:22 +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 F2D74342AEB for ; Mon, 5 Jul 2021 08:40:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 56AD463F for ; Mon, 5 Jul 2021 08:40:19 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1625474364.eb752dfa3135774ddd9e409f007356528fba4391.grobian@gentoo> Subject: [gentoo-commits] proj/portage-utils:master commit in: / X-VCS-Repository: proj/portage-utils X-VCS-Files: qmerge.c X-VCS-Directories: / X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: eb752dfa3135774ddd9e409f007356528fba4391 X-VCS-Branch: master Date: Mon, 5 Jul 2021 08:40:19 +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: eef35438-24a6-430a-b074-e06824b94c38 X-Archives-Hash: 6290d7729c84b93e27bd8d8097a20e19 commit: eb752dfa3135774ddd9e409f007356528fba4391 Author: Fabian Groffen gentoo org> AuthorDate: Mon Jul 5 08:39:24 2021 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Mon Jul 5 08:39:24 2021 +0000 URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=eb752dfa qmerge: ignore subslot in calculating replacing version Original patch by Joakim Tjernlund infinera.com> Signed-off-by: Fabian Groffen gentoo.org> qmerge.c | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/qmerge.c b/qmerge.c index 9cbcc45..a624b89 100644 --- a/qmerge.c +++ b/qmerge.c @@ -1095,13 +1095,23 @@ pkg_merge(int level, const depend_atom *qatom, const tree_match_ctx *mpkg) previnst = best_version(slotatom, BV_INSTALLED); if (previnst != NULL) { - char *orepo = previnst->atom->REPO; - previnst->atom->REPO = NULL; - /* drop REPO from query, we don't care about where the - * replacement comes from here */ - replacing = atom_compare(mpkg->atom, previnst->atom); - replver = previnst->atom->PVR; - previnst->atom->REPO = orepo; + char *orepo; + char *osubslot; + + /* drop REPO and SUBSLOT from query, we don't care about where + * the replacement comes from here, SUBSLOT only affects rebuild + * triggering */ + orepo = previnst->atom->REPO; + osubslot = previnst->atom->SUBSLOT; + previnst->atom->REPO = NULL; + previnst->atom->SUBSLOT = NULL; + + replacing = atom_compare(mpkg->atom, previnst->atom); + replver = previnst->atom->PVR; + + /* restore atom for later printing/handling */ + previnst->atom->REPO = orepo; + previnst->atom->SUBSLOT = osubslot; } (void)qprint_tree_node(level, mpkg, previnst, replacing);