From patchwork Mon Feb 7 09:06:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Xinglu Chen X-Patchwork-Id: 37055 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 28BB127BBEA; Mon, 7 Feb 2022 10:09:17 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E62B327BBE9 for ; Mon, 7 Feb 2022 10:09:16 +0000 (GMT) Received: from localhost ([::1]:54766 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nH0xP-0005Et-Vk for patchwork@mira.cbaines.net; Mon, 07 Feb 2022 05:09:16 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40106) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nGzzM-0005kM-Mr for guix-patches@gnu.org; Mon, 07 Feb 2022 04:07:14 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:47016) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nGzzC-0004F3-OP for guix-patches@gnu.org; Mon, 07 Feb 2022 04:07:11 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nGzzC-0002s0-6z; Mon, 07 Feb 2022 04:07:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53818] [PATCH v2 1/7] upstream: Sort list of updaters. Resent-From: Xinglu Chen Original-Sender: "Debbugs-submit" Resent-CC: maximedevos@telenet.be, guix-patches@gnu.org Resent-Date: Mon, 07 Feb 2022 09:07:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53818 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53818@debbugs.gnu.org Cc: Maxime Devos X-Debbugs-Original-Xcc: Maxime Devos Received: via spool by 53818-submit@debbugs.gnu.org id=B53818.164422481311010 (code B ref 53818); Mon, 07 Feb 2022 09:07:02 +0000 Received: (at 53818) by debbugs.gnu.org; 7 Feb 2022 09:06:53 +0000 Received: from localhost ([127.0.0.1]:40912 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nGzz2-0002rW-Mt for submit@debbugs.gnu.org; Mon, 07 Feb 2022 04:06:52 -0500 Received: from h178-251-242-94.cust.a3fiber.se ([178.251.242.94]:55260 helo=mail.yoctocell.xyz) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nGzz0-0002rJ-Rr for 53818@debbugs.gnu.org; Mon, 07 Feb 2022 04:06:51 -0500 From: Xinglu Chen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yoctocell.xyz; s=mail; t=1644224805; bh=uePA9eU3rVfA9D2Eoe6XklIGhmYCp8Bpq3h/n9/hOOk=; h=From:To:Subject:In-Reply-To:References:Date; b=h11PtFCOM1zR5RujP590b6iLRN3VYdW82tVW0+Rf292w7HAmP8JaqRTHd7qnZujZ0 eoI9l2cPHzLC6nLYUINzabVlQNYBB/KmR0NXpN7hyxMbusW5pCfQfW3JH+GgffBOl8 HQXySucp4zwinh1igfTyxDXVpxgfTnD4LIlhB+Ho= In-Reply-To: References: Message-Id: Date: Mon, 07 Feb 2022 10:06:45 +0100 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 The order determines which updater gets used first when running ‘guix refresh’ on a package. We want the most generic updaters to be last since they usually don’t provide as much or accurate information as language-specific updaters. * guix/upstream.scm (sort-updaters): New procedure. (%updaters): Use it. --- guix/upstream.scm | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/guix/upstream.scm b/guix/upstream.scm index 6666803a92..d5faf9d3ee 100644 --- a/guix/upstream.scm +++ b/guix/upstream.scm @@ -250,14 +250,31 @@ (define (importer-modules) %load-path) #:warn warn-about-load-error))) +(define (sort-updaters updaters) + "Sort UPDATERS by putting the more generic ones last." + (define (genericity updater) + (cond + ((equal? 'repology (upstream-updater-name updater)) + 2) + ((string-prefix? "generic-" + (symbol->string (upstream-updater-name updater))) + 1) + (else 0))) + + (define (less a b) + (<= (genericity a) (genericity b))) + + (stable-sort updaters less)) + (define %updaters ;; The list of publically-known updaters. - (delay (fold-module-public-variables (lambda (obj result) - (if (upstream-updater? obj) - (cons obj result) - result)) - '() - (importer-modules)))) + (delay (sort-updaters + (fold-module-public-variables (lambda (obj result) + (if (upstream-updater? obj) + (cons obj result) + result)) + '() + (importer-modules))))) ;; Tests need to mock this variable so mark it as "non-declarative". (set! %updaters %updaters)