From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id UF0mO5omyF8sLgAA0tVLHw (envelope-from ) for ; Wed, 02 Dec 2020 23:43:22 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id sBvzNpomyF/mFQAAB5/wlQ (envelope-from ) for ; Wed, 02 Dec 2020 23:43:22 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 8237D940253 for ; Wed, 2 Dec 2020 23:43:22 +0000 (UTC) Received: from localhost ([::1]:54340 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kkbmJ-0002qn-Uv for larch@yhetil.org; Wed, 02 Dec 2020 18:43:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:39856) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kkbm2-0002mr-SV for bug-guix@gnu.org; Wed, 02 Dec 2020 18:43:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:54367) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kkbm2-00073u-LF for bug-guix@gnu.org; Wed, 02 Dec 2020 18:43:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kkbm2-0007ll-HP for bug-guix@gnu.org; Wed, 02 Dec 2020 18:43:02 -0500 X-Loop: help-debbugs@gnu.org Subject: bug#23874: [PATCH v2 1/2] profiles: Remove duplicates in manifest transactions. References: In-Reply-To: Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Wed, 02 Dec 2020 23:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 23874 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 23874@debbugs.gnu.org Received: via spool by 23874-submit@debbugs.gnu.org id=B23874.160695255229820 (code B ref 23874); Wed, 02 Dec 2020 23:43:02 +0000 Received: (at 23874) by debbugs.gnu.org; 2 Dec 2020 23:42:32 +0000 Received: from localhost ([127.0.0.1]:37678 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kkblY-0007ku-DV for submit@debbugs.gnu.org; Wed, 02 Dec 2020 18:42:32 -0500 Received: from mailrelay.tugraz.at ([129.27.2.202]:41782) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kkblW-0007kj-Iq for 23874@debbugs.gnu.org; Wed, 02 Dec 2020 18:42:31 -0500 Received: from localhost.localdomain (217-149-166-73.nat.highway.telekom.at [217.149.166.73]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4Cmb9Z53lpz1LBMx; Thu, 3 Dec 2020 00:42:26 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4Cmb9Z53lpz1LBMx DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1606952546; bh=fXt3oej29O4WNNR9Ok3mM74YhJxO7zEWD4kukk9K1/o=; h=From:To:Cc:Subject:Date:From; b=N9JWIcdX0eGOMVaIqZEObXnXaLO9siwVCqgOfgzAWgZK6t7Sg2ujHUu/HogIAKUYB m3Bez5SrUlOeMDkmCD/NkR+bFfMv0D/SOHOR2vboyBNbPk/tZW3FiKj8/svNDJ94Io 6fD0Vz1X5G1y2GVZngHEJDRuPArsmm8OsuUFBGLU= From: Leo Prikler Date: Thu, 3 Dec 2020 00:39:02 +0100 Message-Id: <20201202233901.12902-1-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.116 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: 3.82 Authentication-Results: aspmx1.migadu.com; dkim=fail (headers rsa verify failed) header.d=tugraz.at header.s=mailrelay header.b=N9JWIcdX; dmarc=fail reason="SPF not aligned (relaxed)" header.from=student.tugraz.at (policy=none); spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Migadu-Queue-Id: 8237D940253 X-Spam-Score: 3.82 X-Migadu-Scanner: ns3122888.ip-94-23-21.eu X-TUID: Xbd0rumsnAZB * guix/profiles.scm (manifest-transaction-effects): Delete duplicate effects. --- guix/profiles.scm | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/guix/profiles.scm b/guix/profiles.scm index 1b15257210..034591eb79 100644 --- a/guix/profiles.scm +++ b/guix/profiles.scm @@ -716,6 +716,12 @@ replace it." (manifest-pattern (name (manifest-entry-name entry)) (output (manifest-entry-output entry)))) + (define manifest-entry-pair=? + (match-lambda* + (((m1a . m2a) (m1b . m2b)) + (and (manifest-entry=? m1a m1b) + (manifest-entry=? m2a m2b))) + (_ #f))) (let loop ((input (manifest-transaction-install transaction)) (install '()) @@ -724,8 +730,16 @@ replace it." (match input (() (let ((remove (manifest-transaction-remove transaction))) - (values (manifest-matching-entries manifest remove) - (reverse install) (reverse upgrade) (reverse downgrade)))) + (values (delete-duplicates + (manifest-matching-entries manifest remove) + manifest-entry=?) + (delete-duplicates (reverse install) manifest-entry=?) + (delete-duplicates + (reverse upgrade) + manifest-entry-pair=?) + (delete-duplicates + (reverse downgrade) + manifest-entry-pair=?)))) ((entry rest ...) ;; Check whether installing ENTRY corresponds to the installation of a ;; new package or to an upgrade. -- 2.29.2