From patchwork Sun Aug 1 15:45:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 31681 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7E27227BC78; Sun, 1 Aug 2021 16:46:10 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,UNPARSEABLE_RELAY autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4F9B627BC6B for ; Sun, 1 Aug 2021 16:46:10 +0100 (BST) Received: from localhost ([::1]:52840 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mADfF-0004YY-7y for patchwork@mira.cbaines.net; Sun, 01 Aug 2021 11:46:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42822) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mADf8-0004YC-1s for guix-patches@gnu.org; Sun, 01 Aug 2021 11:46:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53579) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mADf7-0006OO-Py for guix-patches@gnu.org; Sun, 01 Aug 2021 11:46:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mADf7-0003me-On for guix-patches@gnu.org; Sun, 01 Aug 2021 11:46:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49522] [PATCH] weather: Don't look for exported package replacements twice. References: <20210711115638.30207-1-mail@cbaines.net> In-Reply-To: <20210711115638.30207-1-mail@cbaines.net> Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 01 Aug 2021 15:46:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49522 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49522@debbugs.gnu.org Received: via spool by 49522-submit@debbugs.gnu.org id=B49522.162783273814513 (code B ref 49522); Sun, 01 Aug 2021 15:46:01 +0000 Received: (at 49522) by debbugs.gnu.org; 1 Aug 2021 15:45:38 +0000 Received: from localhost ([127.0.0.1]:36892 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mADej-0003m1-Sx for submit@debbugs.gnu.org; Sun, 01 Aug 2021 11:45:38 -0400 Received: from mira.cbaines.net ([212.71.252.8]:40178) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mADei-0003ls-1j for 49522@debbugs.gnu.org; Sun, 01 Aug 2021 11:45:36 -0400 Received: from localhost (unknown [IPv6:2a02:8010:68c1:0:8ac0:b4c7:f5c8:7caa]) by mira.cbaines.net (Postfix) with ESMTPSA id B38A527BC6B for <49522@debbugs.gnu.org>; Sun, 1 Aug 2021 16:45:34 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id fb7b4a1e for <49522@debbugs.gnu.org>; Sun, 1 Aug 2021 15:45:34 +0000 (UTC) From: Christopher Baines Date: Sun, 1 Aug 2021 16:45:34 +0100 Message-Id: <20210801154534.22051-1-mail@cbaines.net> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * guix/scripts/weather.scm (all-packages): Delete duplicates, so that exported replacements aren't included twice. --- guix/scripts/weather.scm | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/guix/scripts/weather.scm b/guix/scripts/weather.scm index 06312d65a2..60a697d1ac 100644 --- a/guix/scripts/weather.scm +++ b/guix/scripts/weather.scm @@ -54,16 +54,18 @@ (define (all-packages) "Return the list of public packages we are going to query." - (fold-packages (lambda (package result) - (match (package-replacement package) - ((? package? replacement) - (cons* replacement package result)) - (#f - (cons package result)))) - '() - - ;; Dismiss deprecated packages but keep hidden packages. - #:select? (negate package-superseded))) + (delete-duplicates + (fold-packages (lambda (package result) + (match (package-replacement package) + ((? package? replacement) + (cons* replacement package result)) + (#f + (cons package result)))) + '() + + ;; Dismiss deprecated packages but keep hidden packages. + #:select? (negate package-superseded)) + eq?)) (define (call-with-progress-reporter reporter proc) "This is a variant of 'call-with-progress-reporter' that works with monadic