From patchwork Fri Aug 11 18:44:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 52755 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 705BE27BBE9; Fri, 11 Aug 2023 19:51:07 +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 7DEB227BBEA for ; Fri, 11 Aug 2023 19:51:04 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qUXDJ-0003fV-BF; Fri, 11 Aug 2023 14:50:21 -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 1qUXD6-0003bg-Hz for guix-patches@gnu.org; Fri, 11 Aug 2023 14:50:09 -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 1qUXD6-00009a-7n; Fri, 11 Aug 2023 14:50:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qUXD5-0007rk-24; Fri, 11 Aug 2023 14:50:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65230] [PATCH 08/13] gnu-maintenance: Accept package object in 'import-html-release' procedure. 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:07 +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.169177979230096 (code B ref 65230); Fri, 11 Aug 2023 18:50:07 +0000 Received: (at 65230) by debbugs.gnu.org; 11 Aug 2023 18:49:52 +0000 Received: from localhost ([127.0.0.1]:47993 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qUXCp-0007pA-Ci for submit@debbugs.gnu.org; Fri, 11 Aug 2023 14:49:51 -0400 Received: from mail-qt1-x835.google.com ([2607:f8b0:4864:20::835]:56583) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qUXCl-0007o7-2F for 65230@debbugs.gnu.org; Fri, 11 Aug 2023 14:49:47 -0400 Received: by mail-qt1-x835.google.com with SMTP id d75a77b69052e-4103c24a989so3351651cf.1 for <65230@debbugs.gnu.org>; Fri, 11 Aug 2023 11:49:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1691779781; x=1692384581; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=nJsQXrgXGbwtflP2tufaD4dT9tVxGKDfykO+85cknIU=; b=bLX4NDo0djFvFul2Zu0oDRNbpXOUfQ+QqY3Q8/mPWYAkb6gnWk/UVAQ4SvneJwMjBA +3B7GnuUUMzcxpB6YXfHHJC+Ba0iUabj0FlRp1l0fJAIUy/7MHt0OnL3r3Au0xEB7mDy Ah77nyPs1R+TIhPpuz6VNnKafuKBXPzwIWnyx3jOKVPv6u+qRgQ1MOFyFZe1cCc+zyJm +IWyxDFXJcIK12Wxt8hgsPrzGfUuF4LqucKSQGFaQdrQKBoFw/pkmGkoAt8Me+ECBmFZ EGmIXPJVoJ5TtMadvruW2jHHUegCtHeJn0UrQnYAkLiCoXxThAE+i5VoFgYkZEZnabSU HC8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691779781; x=1692384581; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nJsQXrgXGbwtflP2tufaD4dT9tVxGKDfykO+85cknIU=; b=VWnDx+/TvFdU+4r1I27a4vUAqksyDhv1BZgP5Q+UI3IznxSRalUrnBWA+xLTq+D34S 4/5LTTo8OKy+59xTH+hq0UuEzHuRTo+ENp+PKwrI42RSPLBx0u8XS57XNiqvxHrYF6pT nKyDRVsiNJveeOR4A6JjE9nHaPl9o8mRc2yZztgHomRS+SWDufRMlvYbTCJMWaVHooAU /IubRJL9cMyghfOwmiV2fg8L714HXDXsf3PQYm6og7GAiSV5zKzJQIFW0NAET/PEtdAB BJDvt0wi4bW2WLbxE5QYTL154S4qJu5GiyumJhFdV3TLLJs0SSj48aBi57lSSrCFcJKA wL7A== X-Gm-Message-State: AOJu0Yyq7O6xOc4hQdLz7BniiEtSfeHxxoTIsnJQOM19zMc0uzGbNZrY kAoNR0dpWa2wBuLZflDgl3dQwyIkeEkXvw== X-Google-Smtp-Source: AGHT+IEoMrKxgkL9kk4ThIflzHKql+/bdjR9BS8lfeOm/i3EZemAjFXRDelcuJUB79JBk5GpPAA6PQ== X-Received: by 2002:a05:622a:13c8:b0:3f6:c0f7:a5d7 with SMTP id p8-20020a05622a13c800b003f6c0f7a5d7mr3562839qtk.35.1691779781444; Fri, 11 Aug 2023 11:49:41 -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.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Aug 2023 11:49:41 -0700 (PDT) From: Maxim Cournoyer Date: Fri, 11 Aug 2023 14:44:55 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: <4f0ffa940ca39719ffa9719a9593190620855769.1691779500.git.maxim.cournoyer@gmail.com> References: <4f0ffa940ca39719ffa9719a9593190620855769.1691779500.git.maxim.cournoyer@gmail.com> 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 This is in preparation for a new URL rewriting feature, which will need to have the current version information available. * guix/gnu-maintenance.scm (import-html-release): Update doc. Adjust default value of the DIRECTORY argument. Bind PACKAGE in lexical scope so that its value there is unchanged. (import-savannah-release, import-kernel.org-release) (import-html-updatable-release): Adjust accordingly. --- guix/gnu-maintenance.scm | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/guix/gnu-maintenance.scm b/guix/gnu-maintenance.scm index 67abbc1c5a..13d6c1c7f2 100644 --- a/guix/gnu-maintenance.scm +++ b/guix/gnu-maintenance.scm @@ -494,11 +494,12 @@ (define (url->links url) (define* (import-html-release base-url package #:key (version #f) - (directory (string-append "/" package)) + (directory (string-append + "/" (package-upstream-name package))) file->signature) - "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. + "Return an for the latest release of PACKAGE 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'. @@ -507,7 +508,8 @@ (define* (import-html-release base-url package if any. Otherwise, FILE->SIGNATURE must be a procedure; it is passed a source file URL and must return the corresponding signature URL, or #f it signatures are unavailable." - (let* ((url (if (string-null? directory) + (let* ((package (package-upstream-name package)) + (url (if (string-null? directory) base-url (string-append base-url directory "/"))) (links (url->links url))) @@ -730,7 +732,6 @@ (define* (import-savannah-release package #:key (version #f)) (match (origin-uri (package-source package)) ((? string? uri) uri) ((uri mirrors ...) uri)))) - (package (package-upstream-name package)) (directory (dirname (uri-path uri)))) ;; Note: We use the default 'file->signature', which adds ".sig", ".asc", ;; or whichever detached signature naming scheme PACKAGE uses. @@ -825,7 +826,6 @@ (define* (import-kernel.org-release package #:key (version #f)) (match (origin-uri (package-source package)) ((? string? uri) uri) ((uri mirrors ...) uri)))) - (package (package-upstream-name package)) (directory (dirname (uri-path uri)))) (import-html-release %kernel.org-base package #:version version @@ -869,8 +869,7 @@ (define* (import-html-updatable-release package #:key (version #f)) "://" (uri-host uri)))) (directory (if custom "" - (dirname (uri-path uri)))) - (package (package-upstream-name package))) + (dirname (uri-path uri))))) (false-if-networking-error (import-html-release base package #:version version