From patchwork Mon Aug 21 18:06:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 53079 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 211E627BBE2; Mon, 21 Aug 2023 19:11:26 +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 729A327BBE9 for ; Mon, 21 Aug 2023 19:11:25 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qY9Md-0005gC-BQ; Mon, 21 Aug 2023 14:10:55 -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 1qY9Ln-0005Mt-Up for guix-patches@gnu.org; Mon, 21 Aug 2023 14:10:08 -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 1qY9Ln-0004xj-7w; Mon, 21 Aug 2023 14:10:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qY9Ln-0007Vv-GG; Mon, 21 Aug 2023 14:10:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65230] [PATCH v3 06/10] 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: Mon, 21 Aug 2023 18:10:03 +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.169264135128701 (code B ref 65230); Mon, 21 Aug 2023 18:10:03 +0000 Received: (at 65230) by debbugs.gnu.org; 21 Aug 2023 18:09:11 +0000 Received: from localhost ([127.0.0.1]:57685 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qY9Kx-0007Sf-5v for submit@debbugs.gnu.org; Mon, 21 Aug 2023 14:09:11 -0400 Received: from mail-qk1-x735.google.com ([2607:f8b0:4864:20::735]:59898) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qY9Ku-0007Re-Lh for 65230@debbugs.gnu.org; Mon, 21 Aug 2023 14:09:09 -0400 Received: by mail-qk1-x735.google.com with SMTP id af79cd13be357-76ce59842c1so201794385a.3 for <65230@debbugs.gnu.org>; Mon, 21 Aug 2023 11:09:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692641340; x=1693246140; 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=JB55eIN3+YDjHsl/pr+1X4HOaf3IB9XXpZBMCai5sLmf/vYABkaAZ5GkRVPb9xfxyD Wptx4s7WCPpYhyAVOgnDcR4zVswwJqbhhpDzgODbhqVL7G1r+1oGdcUI8Xf4b9c8rLFx 2ZGuTU4zctRZeVzV8kAQ6uDIL1itRf4KBbgd21ned8+M47IAKEDETS/B+NjFgEeSf0V4 OXS+/+YZauA+RgIvdOFylntILMspiLLmgO99uLDicICTTfH/NwUNUx4jx5bY30DJ2nw7 wlzxbiEOYxLVSh89c4LT2dkRvzs5U+JJssFFJPb40OCrjHgq+skMJqnt9ZgoktIMc1rs M1fQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692641340; x=1693246140; 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=L8sVKBGbMQc284zt0/M8pTcTfkfzwjKgGa5iVuxAyZ39wdeiMLs93BOZA9oj1owKOl xwmPS95C5/qixZ0pJp9NzgqU0qZbK51FbEIXyr9e6AGZKCfwHeJQ63INGBDswfhh+HSf UBQfDF8rlLQKNVJXltJBeVTobYtuY3BtglPEUWZxlQWy0dkCkQoWuM3LB6aOn8Pf+hh0 YAqS/UqHD/9WYVWBx6kOGLp1+Jef8kCBTRxSrBbD6A5S0PkC+tpDLf9zIZvzDfIWdzBG BRq0trm/8iDkocZWOjI097+PulX1lcOf/aLKOfuuUrOnITggLFopdS9DvE65RzwLB5gM 1jrA== X-Gm-Message-State: AOJu0YzgTVJ+V//+XKX3bLxz++uIWVAoAIAc+Z1Pc15GhgjEf7SZbf9Y tkEyLB6Rg8w75r5KTzgrwU2DawzrAkQ= X-Google-Smtp-Source: AGHT+IGX/S6c9nYyrF/boXzI7rhcyt7f0+ecsD7PMvxxqs9SbPUA38jIsCZgcUoHSs3/4XcAldHI5A== X-Received: by 2002:a05:620a:2ea:b0:76c:9ac2:4e63 with SMTP id a10-20020a05620a02ea00b0076c9ac24e63mr6059025qko.77.1692641340583; Mon, 21 Aug 2023 11:09:00 -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.09.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Aug 2023 11:09:00 -0700 (PDT) From: Maxim Cournoyer Date: Mon, 21 Aug 2023 14:06:10 -0400 Message-ID: <77681888f701b5381cae110887308101655c987a.1692641173.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <5465490ad96f27fecbb69f9bd6f1607d29af6c23.1692641173.git.maxim.cournoyer@gmail.com> References: <5465490ad96f27fecbb69f9bd6f1607d29af6c23.1692641173.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))