From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:c151::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id bmwcHecyTWDDAgAA0tVLHw (envelope-from ) for ; Sat, 13 Mar 2021 21:47:19 +0000 Received: from aspmx2.migadu.com ([2001:41d0:2:c151::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id GLBMGOcyTWDTEQAAB5/wlQ (envelope-from ) for ; Sat, 13 Mar 2021 21:47:19 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx2.migadu.com (Postfix) with ESMTPS id 1D4C79433 for ; Sat, 13 Mar 2021 22:47:19 +0100 (CET) Received: from localhost ([::1]:46710 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lLC6Q-0005Mu-8x for larch@yhetil.org; Sat, 13 Mar 2021 16:47:18 -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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1615672039; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=GPfYYM0GnDdDg1nv+MenAzRUJDTATfPFXYhAGSkyVH0=; b=QZTadheDeokSiyPMU1snQ8TTv6ucSxEKnSdOCCpL0Z6+uBYi4g5YOopAwKCMAWA2p0jcpI ki+hEty2XqHN0TISLNBBfaKg1KXIXeV5HG3dRWr70b1AUKURBQWytgu3034Tj33plu1Np/ A1uV+/3/QxN9NnnKpKF3MQIr0eAoiM9hTToytG9CtBiIf+QhWURFIUlfp0NnyvM2tO9gws dDPvfmUFtIRP7nUWRU5uE8V//YrKL8NCqiYF46ynqqOcXJsDU50f40dQ3uQIPpREj9Gcxk vaqthkMaLkhxiUSN47VseGfQ0cdJMDWOtjNvhTJ6gUHg/7BVNQ+qNvb7WEYErA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1615672039; a=rsa-sha256; cv=none; b=JXqkyUljrrjn1MHviTNlHfYCL8czWWY/ojR1ZHcp7xyXuG90e5r+2vkudfpz1LnL9nteyw 7aI8TrPK44CQnE7J8tBK0Fac/tHDHlMYjrA2JZZ81cb+GNj7/tbFp3IPvZtPjNn+L71ovv 64RCWnu/7a5JQG9r/j9HjFLzImNU//VUji/SP+GLUkmL1Ef7ZNKIL9+Lss7oy85IVdhNqD wFJWxATY+2BqQ+HBLeABESxPa3WSCAcX6JQIzEWE8VHbT+0Hc0T14AsKPjEc+d1LRn8q9X DzyW3jT5dhigYyhi5Euiv2gdpcLAm8cDmpdYP1ibnNOjB+JINxI+EcTMb6Fy+g== ARC-Authentication-Results: i=1; aspmx2.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx2.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -1.90 Authentication-Results: aspmx2.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx2.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 1D4C79433 X-Spam-Score: -1.90 X-Migadu-Scanner: scn0.migadu.com X-TUID: rjRXNPIe8yC4 * 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))) -- 2.30.1