From patchwork Sat Mar 13 21:46:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 27686 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 81F5A27BC52; Sat, 13 Mar 2021 21:47:19 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 55F3127BC54 for ; Sat, 13 Mar 2021 21:47:18 +0000 (GMT) Received: from localhost ([::1]:46710 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lLC6P-0005Mu-Hb for patchwork@mira.cbaines.net; Sat, 13 Mar 2021 16:47:17 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44194) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lLC6B-00055f-4d for guix-patches@gnu.org; Sat, 13 Mar 2021 16:47:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:49301) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lLC6A-00034C-TY for guix-patches@gnu.org; Sat, 13 Mar 2021 16:47:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lLC6A-0000mA-SB for guix-patches@gnu.org; Sat, 13 Mar 2021 16:47:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#47126] [PATCH 2/7] gnu-maintenance: 'latest-html-release' considers non-relative URLs. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 13 Mar 2021 21:47:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47126 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47126@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 47126-submit@debbugs.gnu.org id=B47126.16156719972887 (code B ref 47126); Sat, 13 Mar 2021 21:47:02 +0000 Received: (at 47126) by debbugs.gnu.org; 13 Mar 2021 21:46:37 +0000 Received: from localhost ([127.0.0.1]:60834 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lLC5l-0000kT-12 for submit@debbugs.gnu.org; Sat, 13 Mar 2021 16:46:37 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54482) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lLC5h-0000jj-0G for 47126@debbugs.gnu.org; Sat, 13 Mar 2021 16:46:33 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:42779) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lLC5b-0002qt-7v; Sat, 13 Mar 2021 16:46:27 -0500 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=39284 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1lLC5a-0004wi-PG; Sat, 13 Mar 2021 16:46:27 -0500 From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Sat, 13 Mar 2021 22:46:15 +0100 Message-Id: <20210313214620.28186-2-ludo@gnu.org> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210313214620.28186-1-ludo@gnu.org> References: <20210313214620.28186-1-ludo@gnu.org> 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" X-getmail-retrieved-from-mailbox: Patches * guix/gnu-maintenance.scm (latest-html-release): Allow for URL to be an arbitrary URL rather than a relative URL reference. --- guix/gnu-maintenance.scm | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/guix/gnu-maintenance.scm b/guix/gnu-maintenance.scm index febed57c3a..98d326e500 100644 --- a/guix/gnu-maintenance.scm +++ b/guix/gnu-maintenance.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès +;;; Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès ;;; Copyright © 2012, 2013 Nikita Karetnikov ;;; Copyright © 2021 Simon Tournier ;;; @@ -479,19 +479,21 @@ return the corresponding signature URL, or #f it signatures are unavailable." (port (http-fetch/cached uri #:ttl 3600)) (sxml (html->sxml port))) (define (url->release url) - (and (string=? url (basename url)) ;relative reference? - (release-file? package url) - (let-values (((name version) - (package-name->name+version - (tarball-sans-extension url) - #\-))) - (upstream-source - (package name) - (version version) - (urls (list (string-append base-url directory "/" url))) - (signature-urls - (list (file->signature - (string-append base-url directory "/" url)))))))) + (let* ((base (basename url)) + (url (if (string=? base url) + (string-append base-url directory "/" url) + url))) + (and (release-file? package base) + (let-values (((name version) + (package-name->name+version + (tarball-sans-extension base) + #\-))) + (upstream-source + (package name) + (version version) + (urls (list url)) + (signature-urls + (list (file->signature url)))))))) (define candidates (filter-map url->release (html-links sxml)))