From patchwork Sun Jul 11 11:56:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 31302 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 9995B27BC83; Sun, 11 Jul 2021 12:57:08 +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 696E827BC81 for ; Sun, 11 Jul 2021 12:57:08 +0100 (BST) Received: from localhost ([::1]:57156 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2Y55-0002mC-Hy for patchwork@mira.cbaines.net; Sun, 11 Jul 2021 07:57:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58754) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2Y4z-0002ld-VF for guix-patches@gnu.org; Sun, 11 Jul 2021 07:57:01 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50801) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2Y4z-0004ME-Ne for guix-patches@gnu.org; Sun, 11 Jul 2021 07:57:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m2Y4z-0007HN-OG for guix-patches@gnu.org; Sun, 11 Jul 2021 07:57:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49522] [PATCH] weather: Don't look for exported package replacements twice. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 11 Jul 2021 11:57:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 49522 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49522@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.162600460627959 (code B ref -1); Sun, 11 Jul 2021 11:57:01 +0000 Received: (at submit) by debbugs.gnu.org; 11 Jul 2021 11:56:46 +0000 Received: from localhost ([127.0.0.1]:34114 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m2Y4k-0007Gt-Kn for submit@debbugs.gnu.org; Sun, 11 Jul 2021 07:56:46 -0400 Received: from lists.gnu.org ([209.51.188.17]:44606) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m2Y4i-0007Gk-5R for submit@debbugs.gnu.org; Sun, 11 Jul 2021 07:56:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58738) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2Y4h-0002R1-CY for guix-patches@gnu.org; Sun, 11 Jul 2021 07:56:43 -0400 Received: from mira.cbaines.net ([2a01:7e00:e000:2f8:fd4d:b5c7:13fb:3d27]:41403) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2Y4f-0003uW-LJ for guix-patches@gnu.org; Sun, 11 Jul 2021 07:56:43 -0400 Received: from localhost (unknown [IPv6:2a02:8010:68c1:0:8ac0:b4c7:f5c8:7caa]) by mira.cbaines.net (Postfix) with ESMTPSA id 5B15227BC81 for ; Sun, 11 Jul 2021 12:56:39 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id e8ee5b3b for ; Sun, 11 Jul 2021 11:56:38 +0000 (UTC) From: Christopher Baines Date: Sun, 11 Jul 2021 12:56:38 +0100 Message-Id: <20210711115638.30207-1-mail@cbaines.net> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Received-SPF: pass client-ip=2a01:7e00:e000:2f8:fd4d:b5c7:13fb:3d27; envelope-from=mail@cbaines.net; helo=mira.cbaines.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, UNPARSEABLE_RELAY=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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 There could be performance issues with member here, but only if there are lots of replacements. * guix/scripts/weather.scm (all-packages): Return all exported packages, plus non exported replacements, rather than including exported replacements twice. --- guix/scripts/weather.scm | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/guix/scripts/weather.scm b/guix/scripts/weather.scm index 06312d65a2..0f70dc8460 100644 --- a/guix/scripts/weather.scm +++ b/guix/scripts/weather.scm @@ -53,17 +53,30 @@ #:export (guix-weather)) (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))) + "Return the list of packages we are going to query." + (let* ((packages + (fold-packages (lambda (package result) + (cons package result)) + '() + + ;; Dismiss deprecated packages but keep hidden packages. + #:select? (negate package-superseded))) + (non-exported-replacement-packages + (fold-packages (lambda (package result) + (let ((replacement (package-replacement package))) + (if (and replacement + ;; Avoid double couting replacements + ;; that are themselves exported + (not (member replacement packages))) + (cons replacement result) + result))) + '() + + ;; Dismiss deprecated packages but keep hidden packages. + #:select? (negate package-superseded)))) + (append + packages + non-exported-replacement-packages))) (define (call-with-progress-reporter reporter proc) "This is a variant of 'call-with-progress-reporter' that works with monadic