From patchwork Fri Aug 11 18:44:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 52753 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 757A727BBE9; Fri, 11 Aug 2023 19:51:03 +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 9B4C027BBE2 for ; Fri, 11 Aug 2023 19:51:02 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qUXD9-0003dE-C5; Fri, 11 Aug 2023 14:50:11 -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 1qUXD7-0003by-6Z 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-0000A2-Sz; 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-0007s0-Hs; Fri, 11 Aug 2023 14:50:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65230] [PATCH 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: 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.169177979230103 (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]:47995 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qUXCp-0007pN-Ts for submit@debbugs.gnu.org; Fri, 11 Aug 2023 14:49:52 -0400 Received: from mail-qt1-x82d.google.com ([2607:f8b0:4864:20::82d]:57685) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qUXCm-0007oG-P9 for 65230@debbugs.gnu.org; Fri, 11 Aug 2023 14:49:49 -0400 Received: by mail-qt1-x82d.google.com with SMTP id d75a77b69052e-4103cec468fso2778371cf.3 for <65230@debbugs.gnu.org>; Fri, 11 Aug 2023 11:49:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1691779783; x=1692384583; 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=5I9rceGXcH20fgH2Z7SMk5CkvVXegx7nRdTB4S8WdA4=; b=F1rYmum9EqCbI4r9usk5np4pHApfr8UYsoOlXxVUcY9S7IiHyjb5qC85/vewzJReHX 1Vmu5trlSj8FLy1LClM6A9THhjPhoEBveGNVCkXl4nM27V2uxinH/rjDjRpewdmfF3M2 sidygSsc3djm4EEns6pHjeEFL0KpYXh/nCfPHd+BEbYhKAqkA/u4ew46RXVZkWW7n7RZ Y/Wvj8Q24oTHJXRXEw4/B0POyanvKF8MplrKZw5KyNuULtTaUzpvB+cguZsKr/rx69qt coDFgUgRO9+2o9HouvX6w/JgRZCaes/gPsq2TKdY50+1xiuP3YJF+Rxb6KGgOYZjw1DQ 4mZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691779783; x=1692384583; 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=5I9rceGXcH20fgH2Z7SMk5CkvVXegx7nRdTB4S8WdA4=; b=OHPqS9ko9OMIg3/c8Za0iOBTWA+6NfijPJnPMxti/RL4vH71lRw+O4HU94RQlzrjwi ipN4gxCUeJlCvFURFnqQV6f7Ug+6SALrhEXefZ8S+/p9e5e/hZMJYUL6rjt6o56tKuJ7 h0dUQV+11w133cYO0RceiuhRRkQiiThYa8lhHE2AfQMQBA6Us6556NPYTml+HHs5PTXP fP8hwOW5PKh7BsKljYERJSyvrdVVs+po+7/KwcrjV/z3JwC120sq+06dziwvSUEFXjpV nsHLWMsPhSrMGPnjoMOBJuivbETyHF7g41jRTcdPrb/P1GuRdaqv4BTdBZUCrYAmlzJc V6XA== X-Gm-Message-State: AOJu0Yz7zvchUz8eu+Ng/NNgq7UjrCjEwDZRNzKa1C7xWA1yeuauMj1e d+2QMPC/Tt7onEkT7ULKczUhrxYJJL727w== X-Google-Smtp-Source: AGHT+IH4MpUc3lnv4nyvm9UwGnvpqJm/XJAcX53q6dk5nlfWhfhE6WmBVEx+h3ZCUoA5dGEAt/No+Q== X-Received: by 2002:ac8:57cc:0:b0:404:c430:6695 with SMTP id w12-20020ac857cc000000b00404c4306695mr3236642qta.53.1691779783098; Fri, 11 Aug 2023 11:49:43 -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.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Aug 2023 11:49:42 -0700 (PDT) From: Maxim Cournoyer Date: Fri, 11 Aug 2023 14:44:56 -0400 Message-ID: <0d5d4a22cf8e465d95b8462627af55815b3a823a.1691779500.git.maxim.cournoyer@gmail.com> 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 * guix/gnu-maintenance.scm (import-html-release): Add docstring to the 'file->signature/guess' and 'url->release' nested procedures. --- 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))