From patchwork Fri Aug 11 18:44:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 52748 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 E7A8427BBE9; Fri, 11 Aug 2023 19:50:31 +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 2A54727BBEA for ; Fri, 11 Aug 2023 19:50:30 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qUXD6-0003bR-FA; Fri, 11 Aug 2023 14:50:08 -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 1qUXD4-0003ah-9n for guix-patches@gnu.org; Fri, 11 Aug 2023 14:50: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 1qUXD3-00008P-DG; Fri, 11 Aug 2023 14:50:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qUXD0-0007qX-Kz; Fri, 11 Aug 2023 14:50:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65230] [PATCH 01/13] 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: Fri, 11 Aug 2023 18:50: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.169177977529975 (code B ref 65230); Fri, 11 Aug 2023 18:50:02 +0000 Received: (at 65230) by debbugs.gnu.org; 11 Aug 2023 18:49:35 +0000 Received: from localhost ([127.0.0.1]:47970 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qUXCY-0007nO-Ug for submit@debbugs.gnu.org; Fri, 11 Aug 2023 14:49:35 -0400 Received: from mail-qt1-x832.google.com ([2607:f8b0:4864:20::832]:57504) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qUXCX-0007n8-AK for 65230@debbugs.gnu.org; Fri, 11 Aug 2023 14:49:34 -0400 Received: by mail-qt1-x832.google.com with SMTP id d75a77b69052e-40fd276621aso14860261cf.2 for <65230@debbugs.gnu.org>; Fri, 11 Aug 2023 11:49:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1691779767; x=1692384567; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=QXWO6N8H7GhNEgL+zQcNmoAAyzbZv7yNXYx7A5tdUqE=; b=BjwK8U/z7rh0NdwdVz60RiBaHbQ7Ilte5FYcHGtKYO90ZZEctBif1krq2FWC6aK/aQ Vg9UqeIuXvdPN2jxI9yFhNyRvL6s9/g65vli65vIoR0nmfr7J8tln+pFTJ+7Tg7mjLjv BfTiyJYgSWnJ7LW5gEz7sjyIg171D/qo8LuRWJ70NQnOqHisOL3CeZuj8o3wx2EBywtJ Cpzam9icyM48r0mc/W5vn/rdYjYS9wXtcgHBfn7KIgRY/dkEtiKc2xnURQ0LLc4+fLEv gDD8p4vyEIU2TkJFSupGL92qvvvD67lqKNknllkAQL9vLZ1qwgm6Rc5W4X+ke9zmyKiY XDKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691779767; x=1692384567; 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=QXWO6N8H7GhNEgL+zQcNmoAAyzbZv7yNXYx7A5tdUqE=; b=bRrtkuFhfT0LeNUM3mH7+XUFhCdnTFOlVvwbDFxOhwP8vYYULouO5DgA4y8rUSAVZT rR/2Gd8WI7NJRwZkm4GDIfK6zAc/JDly2kGucYomshxnw1bFhd2Fkmv1tp+KFvEnEcyC Jf6O1HgvK3F/Weeun8Uz970wkFp4Ly6KFM9zivQiMsqzWePEkUUrlMBDi5PO1uAkmbsJ GItMaURXje8wHY68dQrdvXLfJyl+dL3QkWGfoQAtBbM1U7t2xC4n9df4RocA5k0VIvWg Ie3BOp9rlGEUT5iWTaWzEvakJAdTz38DloDsKZ1Y3IYWi/o4uwuqmWiXlYi3hX3XVXLp gkGg== X-Gm-Message-State: AOJu0YzY55OVv8xHV9wP4c5QEarGJ5ma0jal4wr1pKuBKyTNULu/JZx/ gcJ135pWZ4WYdbIQcqbRQmcabTFHT6iLbA== X-Google-Smtp-Source: AGHT+IHmwQ7EJrxX6pFI3vXxSzVf3YB4oPrQs45i98e40LGM+IqKVnsKRoi/tODKoLmTHcrj+kD4Bg== X-Received: by 2002:ac8:5a83:0:b0:400:9b69:7c13 with SMTP id c3-20020ac85a83000000b004009b697c13mr2773361qtc.59.1691779767367; Fri, 11 Aug 2023 11:49:27 -0700 (PDT) Received: from localhost.localdomain (dsl-205-236-230-92.b2b2c.ca. [205.236.230.92]) by smtp.gmail.com with ESMTPSA id e29-20020ac8011d000000b00405553305casm1366398qtg.86.2023.08.11.11.49.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Aug 2023 11:49:27 -0700 (PDT) From: Maxim Cournoyer Date: Fri, 11 Aug 2023 14:44:48 -0400 Message-ID: <4f0ffa940ca39719ffa9719a9593190620855769.1691779500.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. --- guix/gnu-maintenance.scm | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) base-commit: 77251c5f5af193dcd031dffef744001cfc48f7e5 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