From patchwork Sat Mar 13 21:46:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 27684 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 4ED3D27BC55; Sat, 13 Mar 2021 21:47:15 +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 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 72FC227BC54 for ; Sat, 13 Mar 2021 21:47:12 +0000 (GMT) Received: from localhost ([::1]:46194 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lLC6J-000599-Le for patchwork@mira.cbaines.net; Sat, 13 Mar 2021 16:47:11 -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 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): 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