From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id xCfCL+EyTWBOawAA0tVLHw (envelope-from ) for ; Sat, 13 Mar 2021 21:47:13 +0000 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id mE8zK+EyTWBeEgAAB5/wlQ (envelope-from ) for ; Sat, 13 Mar 2021 21:47:13 +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 aspmx1.migadu.com (Postfix) with ESMTPS id 5680316FAE for ; Sat, 13 Mar 2021 22:47:13 +0100 (CET) Received: from localhost ([::1]:46194 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lLC6K-000599-EI for larch@yhetil.org; Sat, 13 Mar 2021 16:47:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44200) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lLC6C-00056C-9c for guix-patches@gnu.org; Sat, 13 Mar 2021 16:47:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:49304) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lLC6C-00034z-2d for guix-patches@gnu.org; Sat, 13 Mar 2021 16:47:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lLC6C-0000mW-10 for guix-patches@gnu.org; Sat, 13 Mar 2021 16:47:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#47126] [PATCH 5/7] gnu-maintenance: 'latest-html-release' better computes version number. 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:03 +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.16156720022926 (code B ref 47126); Sat, 13 Mar 2021 21:47:03 +0000 Received: (at 47126) by debbugs.gnu.org; 13 Mar 2021 21:46:42 +0000 Received: from localhost ([127.0.0.1]:60842 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lLC5p-0000l2-Md for submit@debbugs.gnu.org; Sat, 13 Mar 2021 16:46:41 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54508) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lLC5k-0000js-VH for 47126@debbugs.gnu.org; Sat, 13 Mar 2021 16:46:38 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:42783) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lLC5e-0002rl-61; Sat, 13 Mar 2021 16:46:31 -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 1lLC5d-0004wi-MB; Sat, 13 Mar 2021 16:46:29 -0500 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Sat, 13 Mar 2021 22:46:18 +0100 Message-Id: <20210313214620.28186-5-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-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=1615672033; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: 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=VLDHXYnzcW1wj0SOaqmWiC7J41FdDBnde2DZeB+Yx0k=; b=aaPWCtEp2rPEVoEfnGezWXhjB6q/AYHSs1/0tLylNAFB//BEBKoVijyVA0XA5Wdt1wWhpX NlRF+XHVRe6DXZQP0+WkExNDJxM+0fMGJfVFNjFXQbksyGe35m59jGe+J3khvn6Uxjnjlq tpt/XExA0Pq2bmz3cabFXMUeA29NCQq+i/bltl+rYxpROVLRkHWtl/DfgPVuwciGH5YmGB m3Unxo7EVaqgA1k8/vOyqEYAxrMsoiGXmvJOwRuO3sz+4Q/q2Ndy2CTKNsxh1NkX8lX8mL M95qpLdeRZN2e+YZzfkyGRBJ/36iS8WUknEuyB9cx6ChBnKGQ1bbX/16RQlsXA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1615672033; a=rsa-sha256; cv=none; b=dQw5S049ttTTKHytqnxiwuWMuxiDlrl+DcY8mb3GQAWOykBFtoBiywOWmkmoUR4HeXtwZ3 ypQ7SwnapVoKTFV68n/YPjU5NOAWPtiBK6/zlkui9GHMK4mnLI9STLkLJ0C57oXfWOoIlS pu5ZJuiruyy2U+jcnMVzLl5v1d1hBiWwnmC9l2iOuSiXcyigS2co6u317IaZl5EN9O20bl 9NDPa1gsVvRm5zZBaRbLv7vSdU5fvPNCmoU4j+vkDvcCbi+hFhIKI+gtRwAVsCG7MLrdAk p37Fpcn/TIMnlGM2sF/kiYTHpLMLm85WX2JyfjCf5AyO9Efzxeoy95a5H263vw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.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: 2.10 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.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: 5680316FAE X-Spam-Score: 2.10 X-Migadu-Scanner: scn0.migadu.com X-TUID: G3q8ANmF+bVc * guix/gnu-maintenance.scm (latest-html-release): Use 'tarball->version' rather than 'package-name->name+version' to extract the version number. This fixes problems with packages like 'netsurf' and 'libdom' that have "-src" in their tarball name, where "src" would be taken as the new version number. --- guix/gnu-maintenance.scm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/guix/gnu-maintenance.scm b/guix/gnu-maintenance.scm index 3bffa4d11e..5aa16acfde 100644 --- a/guix/gnu-maintenance.scm +++ b/guix/gnu-maintenance.scm @@ -499,12 +499,9 @@ are unavailable." (string-append base-url directory "/" url) url))) (and (release-file? package base) - (let-values (((name version) - (package-name->name+version - (tarball-sans-extension base) - #\-))) + (let ((version (tarball->version base))) (upstream-source - (package name) + (package package) (version version) (urls (list url)) (signature-urls -- 2.30.1