From patchwork Tue Aug 15 20:29:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 52865 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 3848D27BBE9; Tue, 15 Aug 2023 21:32:46 +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 8882B27BBE2 for ; Tue, 15 Aug 2023 21:32:44 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qW0i4-00058S-EM; Tue, 15 Aug 2023 16:32:12 -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 1qW0i1-00054m-69 for guix-patches@gnu.org; Tue, 15 Aug 2023 16:32: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 1qW0i0-0008N6-Tr; Tue, 15 Aug 2023 16:32:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qW0hx-0005gX-98; Tue, 15 Aug 2023 16:32:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65230] [PATCH v2 09/13] gnu-maintenance: Document nested procedures in 'import-html-release'. 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: Tue, 15 Aug 2023 20:32:05 +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.169213147821701 (code B ref 65230); Tue, 15 Aug 2023 20:32:05 +0000 Received: (at 65230) by debbugs.gnu.org; 15 Aug 2023 20:31:18 +0000 Received: from localhost ([127.0.0.1]:36804 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qW0hB-0005dp-BG for submit@debbugs.gnu.org; Tue, 15 Aug 2023 16:31:17 -0400 Received: from mail-qt1-x832.google.com ([2607:f8b0:4864:20::832]:42067) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qW0h4-0005cb-4q for 65230@debbugs.gnu.org; Tue, 15 Aug 2023 16:31:11 -0400 Received: by mail-qt1-x832.google.com with SMTP id d75a77b69052e-40fda01c8beso26577641cf.0 for <65230@debbugs.gnu.org>; Tue, 15 Aug 2023 13:31:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692131464; x=1692736264; 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=AMByyaIJSuomag/N+KKSRiluVBRVpJ6bNmbJjcSE/M8=; b=amYGO+J9p8HpR4yok5kWLrX8NVMoSmAoz3Je+3vbg5MmmBYO4P8aL43LKDUAygS3NA gk4/yOWydloK89ZI1jTPbxsm2KEX1SuREVRCHs9juWVrYqM4oU2BkBm5YXH3VzpgousY Szxk6auaBwNLgygl4e9OrRKCC1C+Vewg9XJa2AczSf8xrEOSFNx0lG69uJwtdbECdzCN s1dZtots5CeuxAdvxqwPaTx/8TIlmA1kc5VO3Cu/5seevFGpanqlSDw8npa2QcP15kz3 dcCEh9sgf2KwoQdYBbMPOjNUGH2NGAvZ8Y6yBfMjGADa1hdJlBx3kDM3NIwaxUCMSsRJ wYOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692131464; x=1692736264; 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=AMByyaIJSuomag/N+KKSRiluVBRVpJ6bNmbJjcSE/M8=; b=aUfyJ90XXN/yLUCBXf/6jiGRmyhkT5jCHs0mOiHyJW92czj/9kQI3rDNixfbyvsaWe PBqm5KTnuGqzs4s1y8AwBUV5ty0VCS8ylJlIOfh5UvUDfNky4WSIYCPBeYaz2bO2I4br b1J1dvt9/i/d9irO0Lp4sePTND66iD75KBfZdYAs+AeBPhZ1Ag/Jjc7E4BrgciK9roX9 Jw0fbhezkAxXm3f5XCB7fJZ52xNYTsiX2n+8D3162aeI4u1v9KBFbKFLzM6Sjo4+BlzI myeRZrhT3yL3ZrePvcFo8Ki9NfU8SRCvm4EewjCsOT399rhzU8Y8T9Yixnt0EJ0aOh3g y3pg== X-Gm-Message-State: AOJu0YxpehDUl7UzjYL5WpFLyt74f9yxw4eQEmzFsGpc0NSb7d5MSCLb UbW9EJyNx64ngQV4MSal/HTUCQHUfyTwPA== X-Google-Smtp-Source: AGHT+IGSYJdhOgS3nqYfo/H9leM7/NayDex0GpAW4S9/G5C9A3GHN1F06etLcie0vH49WAgsFBZKpg== X-Received: by 2002:a05:622a:285:b0:405:47aa:6846 with SMTP id z5-20020a05622a028500b0040547aa6846mr4259017qtw.32.1692131464404; Tue, 15 Aug 2023 13:31:04 -0700 (PDT) Received: from localhost.localdomain (dsl-148-65.b2b2c.ca. [66.158.148.65]) by smtp.gmail.com with ESMTPSA id f26-20020ac86eda000000b0040fe13251dasm4021078qtv.83.2023.08.15.13.31.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Aug 2023 13:31:03 -0700 (PDT) From: Maxim Cournoyer Date: Tue, 15 Aug 2023 16:29:33 -0400 Message-ID: <13bb74db81862803c9e2ae982c117de71acd2611.1692131377.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <73d2f33e50141cd7bf6118f7f2db156e455294b1.1692131377.git.maxim.cournoyer@gmail.com> References: <73d2f33e50141cd7bf6118f7f2db156e455294b1.1692131377.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 * guix/gnu-maintenance.scm (import-html-release): Add docstring to the 'file->signature/guess' and 'url->release' nested procedures. --- (no changes since v1) guix/gnu-maintenance.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/guix/gnu-maintenance.scm b/guix/gnu-maintenance.scm index 13d6c1c7f2..9bab8e9e5f 100644 --- a/guix/gnu-maintenance.scm +++ b/guix/gnu-maintenance.scm @@ -514,6 +514,7 @@ (define* (import-html-release base-url package (string-append base-url directory "/"))) (links (url->links url))) (define (file->signature/guess url) + "Return the first link that matches a signature extension, else #f." (let ((base (basename url))) (any (lambda (link) (any (lambda (extension) @@ -524,6 +525,8 @@ (define* (import-html-release base-url package links))) (define (url->release url) + "Return an object if a release file was found at URL, +else #f." (let* ((base (basename url)) (base-url (string-append base-url directory)) (url (cond ((and=> (string->uri url) uri-scheme) ;full URL? @@ -574,7 +577,7 @@ (define* (import-html-release base-url package (() #f) ((first . _) (if version - ;; find matching release version and return it + ;; Find matching release version and return it. (find (lambda (upstream) (string=? (upstream-source-version upstream) version)) (coalesce-sources candidates))