From patchwork Thu Sep 1 09:01:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 42112 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 E467D27BBEA; Thu, 1 Sep 2022 11:07:30 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable 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 8EB7527BBE9 for ; Thu, 1 Sep 2022 11:07:30 +0100 (BST) Received: from localhost ([::1]:54282 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oTh6f-0001QH-MZ for patchwork@mira.cbaines.net; Thu, 01 Sep 2022 06:07:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56752) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oTg6I-00047M-PZ for guix-patches@gnu.org; Thu, 01 Sep 2022 05:03:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51456) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oTg6I-0005dZ-Dx for guix-patches@gnu.org; Thu, 01 Sep 2022 05:03:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oTg6I-0008Q5-91 for guix-patches@gnu.org; Thu, 01 Sep 2022 05:03:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57515] [PATCH 5/8] gnu-maintenance: Simplify latest-savannah-release. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 01 Sep 2022 09:03:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57515 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57515@debbugs.gnu.org Received: via spool by 57515-submit@debbugs.gnu.org id=B57515.166202292332224 (code B ref 57515); Thu, 01 Sep 2022 09:03:02 +0000 Received: (at 57515) by debbugs.gnu.org; 1 Sep 2022 09:02:03 +0000 Received: from localhost ([127.0.0.1]:41190 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oTg5L-0008NY-DU for submit@debbugs.gnu.org; Thu, 01 Sep 2022 05:02:03 -0400 Received: from michel.telenet-ops.be ([195.130.137.88]:48522) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oTg5G-0008MI-38 for 57515@debbugs.gnu.org; Thu, 01 Sep 2022 05:02:01 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:5dba:d409:33f7:a16]) by michel.telenet-ops.be with bizsmtp id EZ1v2800K20ykKC06Z1xpg; Thu, 01 Sep 2022 11:01:57 +0200 From: Maxime Devos Date: Thu, 1 Sep 2022 11:01:52 +0200 Message-Id: X-Mailer: git-send-email 2.37.2 In-Reply-To: References: MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1662022917; bh=Fi9j90kA3p+THPjRx9ru5spWvmzejwnCKdk9PgB0sUo=; h=From:To:Subject:Date:In-Reply-To:References:Reply-To; b=kqpxAAnoJo0z0IHfMSoec+PUeQtAW/TfB0f6Frm1Q1Irp542i4Jeho3zWY6p1kjwf IY2kKJq7BKt3z8/30e2k3ABTAS75gd8wpR5q8DIqIAt9RrTzFYkNaybtiTanbHPMNG mJ//96yiwBrffFCEgkZlQgKOCF9weXsIdqTpJNygsei4vY/zkjLWd6ElG4azuvy5IY J32LWyQopQFdImwRaE+ynzuL2ZLte9RICDUkb10gwcjZnz5ZVkBPbvAxkSgFU+51Xe DPyoXWg7JdvpAjV9IIzQlCkDPDciN4QQLMUitNYUEWCvIsJGXOJGyLi4DVta+y2PkY ev7qp4laGxOcQ== 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: , Reply-To: 57515@debbugs.gnu.org Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches As latest-html-release now produces mirror:// URIs where possible, the additional post-processing is not necessary anymore. As a test, try updating 'gash', the mirror:// URI remains. * gnu-maintenance.scm (latest-savannah-release): Do not call adjusted-upstream-source on the result. --- guix/gnu-maintenance.scm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/guix/gnu-maintenance.scm b/guix/gnu-maintenance.scm index 2f09539d5d..853ad91ea0 100644 --- a/guix/gnu-maintenance.scm +++ b/guix/gnu-maintenance.scm @@ -701,15 +701,12 @@ (define (latest-savannah-release package) ((? string? uri) uri) ((uri mirrors ...) uri)))) (package (package-upstream-name package)) - (directory (dirname (uri-path uri))) - (rewrite (url-prefix-rewrite %savannah-base - "mirror://savannah"))) + (directory (dirname (uri-path uri)))) ;; Note: We use the default 'file->signature', which adds ".sig", ".asc", ;; or whichever detached signature naming scheme PACKAGE uses. - (and=> (latest-html-release package - #:base-url %savannah-base - #:directory directory) - (cut adjusted-upstream-source <> rewrite)))) + (latest-html-release package + #:base-url %savannah-base + #:directory directory))) (define (latest-sourceforge-release package) "Return the latest release of PACKAGE."