From patchwork Mon Aug 21 18:06:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 53075 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 BDF5D27BBE9; Mon, 21 Aug 2023 19:10:16 +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_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS 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 E667627BBE2 for ; Mon, 21 Aug 2023 19:10:14 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qY9LV-0005DK-CP; Mon, 21 Aug 2023 14:09:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qY9Kr-00054D-5o for guix-patches@gnu.org; Mon, 21 Aug 2023 14:09:06 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qY9Kp-0004a3-73; Mon, 21 Aug 2023 14:09:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qY9Ko-0007RH-HA; Mon, 21 Aug 2023 14:09:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65230] [PATCH v3 01/10] gnu-maintenance: Make base-url argument of import-html-release required. References: In-Reply-To: Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, rekado@elephly.net, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Mon, 21 Aug 2023 18:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65230 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65230@debbugs.gnu.org Cc: Maxim Cournoyer , Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 65230-submit@debbugs.gnu.org id=B65230.169264133928577 (code B ref 65230); Mon, 21 Aug 2023 18:09:02 +0000 Received: (at 65230) by debbugs.gnu.org; 21 Aug 2023 18:08:59 +0000 Received: from localhost ([127.0.0.1]:57663 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qY9Kk-0007Qq-V5 for submit@debbugs.gnu.org; Mon, 21 Aug 2023 14:08:59 -0400 Received: from mail-qt1-x82d.google.com ([2607:f8b0:4864:20::82d]:47187) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qY9Kk-0007QX-8X for 65230@debbugs.gnu.org; Mon, 21 Aug 2023 14:08:58 -0400 Received: by mail-qt1-x82d.google.com with SMTP id d75a77b69052e-41095b84d8eso10020551cf.2 for <65230@debbugs.gnu.org>; Mon, 21 Aug 2023 11:08:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692641330; x=1693246130; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=nPe+PQu+Le99kNcteUXZMEhcKyG+iLaCRslNHkWva4o=; b=qINudUHfxQDw+kaXnVBiLiVfLdJUkPW63b9W8OaKiAMBE8tcvZqeUNW0GFcOD1PMex 22ZCYNyWPgjEVS1IcpXJ3AKj+YGFcaI0y+Ae5myK4Z/Rs2wXt27WTLGYEm53Wt3uBv3O O6dfH/7JzkSiCIfRPNApBqUB8JEJEx1twtOD+SN2AnzIfMCfxWwjFgbCNBKGkdImq5Dx 2MZJoN2Bmh+5zyU8zPYYE6a0jivhK12UnvsjAHtE/92Ot7E50hXR1wpGHBFjqg0KGKx0 bJU3G7dLqX+36Td4Q98kXJ+wUi2erzFMKp2uMnHk1BYyp/EGLWb99wyc8RVIPUda9Jhx qh1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692641330; x=1693246130; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=nPe+PQu+Le99kNcteUXZMEhcKyG+iLaCRslNHkWva4o=; b=dTP1NuaCgNu5bj0087OD4WZ3YaZKupYnO2dloV5XuYK9ktNmG8v1NqsvMvZ9WnvNdf eOF3dzkcDGU4GOWnUQwJ3xL/+CJ+aJFdCWMyLq2oURQuEqUl4xNzwKeOO4kizrvHByXe JPCAQSPLi4OzYkpS4lwRcCMV6wBjndrqWtfE0Y+Hp7jKKkRu9YKnLnbnHTWZ3SYUDQ0H /RTshbTitBsvhxw/CCi4kxn5X3jWKe0r6IOI/fHwVFbBIhQjug4KdDko7LhfF0u33wEC bw3rQ+L/yzn+/YTcR60cH5MQMBU+P6aT7Y6CPxJN6o3p1dX5HQP8bdKEaT17ejdyEV6Q 6KFA== X-Gm-Message-State: AOJu0YwrDc6oxi0M6wOdxDUxUvudDZY4i+5+sJMZkTbeznm7MC++qF3N +TPcq5PZsCTlP7O5rMyxQP2ou2Q3yOI= X-Google-Smtp-Source: AGHT+IGug6flSl3RimMvfIUH+z/+gSob1RZ9AbzR+xLk1RKKTacOMAkXHZ+GFf7yuU6t7AQyB1gYow== X-Received: by 2002:ac8:5b56:0:b0:40f:da10:2426 with SMTP id n22-20020ac85b56000000b0040fda102426mr8808863qtw.56.1692641330011; Mon, 21 Aug 2023 11:08:50 -0700 (PDT) Received: from localhost.localdomain (dsl-10-148-105.b2b2c.ca. [72.10.148.105]) by smtp.gmail.com with ESMTPSA id t16-20020a05620a035000b00767303dc070sm2635523qkm.8.2023.08.21.11.08.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Aug 2023 11:08:49 -0700 (PDT) From: Maxim Cournoyer Date: Mon, 21 Aug 2023 14:06:05 -0400 Message-ID: <5465490ad96f27fecbb69f9bd6f1607d29af6c23.1692641173.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches It doesn't make sense to have it default to something like "https://kernel.org/pub"; it should always be provided explicitly. * guix/gnu-maintenance.scm (import-html-release) <#:base-url>: Turn keyword argument into a positional argument. Update doc. * guix/gnu-maintenance.scm (import-savannah-release): Adjust call accordingly. (import-kernel.org-release): Likewise. (import-html-updatable-release): Likewise. --- (no changes since v1) guix/gnu-maintenance.scm | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) base-commit: b03f4ff76e7502d4636ff805727df437c17de21a diff --git a/guix/gnu-maintenance.scm b/guix/gnu-maintenance.scm index 32712f7218..b95a45824e 100644 --- a/guix/gnu-maintenance.scm +++ b/guix/gnu-maintenance.scm @@ -483,15 +483,14 @@ (define (html-links sxml) (_ links)))) -(define* (import-html-release package +(define* (import-html-release base-url package #:key (version #f) - (base-url "https://kernel.org/pub") (directory (string-append "/" package)) file->signature) - "Return an for the latest release of PACKAGE (a string) on -SERVER under DIRECTORY, or #f. Optionally include a VERSION string to fetch a -specific version. + "Return an for the latest release of PACKAGE (a string) +under DIRECTORY at BASE-URL, or #f. Optionally include a VERSION string to +fetch a specific version. BASE-URL should be the URL of an HTML page, typically a directory listing as found on 'https://kernel.org/pub'. @@ -730,9 +729,8 @@ (define* (import-savannah-release package #:key (version #f)) (directory (dirname (uri-path uri)))) ;; Note: We use the default 'file->signature', which adds ".sig", ".asc", ;; or whichever detached signature naming scheme PACKAGE uses. - (import-html-release package + (import-html-release %savannah-base package #:version version - #:base-url %savannah-base #:directory directory))) (define* (latest-sourceforge-release package #:key (version #f)) @@ -824,9 +822,8 @@ (define* (import-kernel.org-release package #:key (version #f)) ((uri mirrors ...) uri)))) (package (package-upstream-name package)) (directory (dirname (uri-path uri)))) - (import-html-release package + (import-html-release %kernel.org-base package #:version version - #:base-url %kernel.org-base #:directory directory #:file->signature file->signature))) @@ -870,9 +867,8 @@ (define* (import-html-updatable-release package #:key (version #f)) (dirname (uri-path uri)))) (package (package-upstream-name package))) (false-if-networking-error - (import-html-release package + (import-html-release base package #:version version - #:base-url base #:directory directory)))) (define %gnu-updater