From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id kFQLEFfUTmWmAQAAauVa8A:P1 (envelope-from ) for ; Sat, 11 Nov 2023 02:09:43 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id kFQLEFfUTmWmAQAAauVa8A (envelope-from ) for ; Sat, 11 Nov 2023 02:09:43 +0100 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 BF95022FD2 for ; Sat, 11 Nov 2023 02:09:42 +0100 (CET) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=cott.am header.s=protonmail header.b=Cu7hxl4S; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1699664983; h=from:from:sender:sender:reply-to: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:dkim-signature; bh=7EHzu5y8FyMk/7xEy7VsW/VXwtFHbrm1Fg+hw7pAyVg=; b=cdgkD1skW+Jwyo/ddu5a/O0Qot+q4KKLc6a3nW6k6W6kOLCtk/vneOgHF7Cerpng8midji 9/aVdBRa/d/40TDGGDmqX16CsbqsRHSDZyPnvB1s3F867DVNEBZRK9J6PiG4NtMEiXTKAP nEDXYN3c6NyorJIvvfQl1Ue7voEkwnVXLJYM0nT1Wiil8LxC5aWgJrXEzzVY/2GM7eCE1f OwyXc/o4xMqzDAvEXCOaX7zNNvFwXtueNrewv0P/MT8GiZ5lxJC+GyrQw3FVySDyWtPdAq iuWfl9fNhjV4DTfGh7NQQBJduvpTjeNvZoa+ZPZezYI8d4Y7+Tm4yaWj1GHpeA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=cott.am header.s=protonmail header.b=Cu7hxl4S; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1699664983; a=rsa-sha256; cv=none; b=Z+PybjocxGT6NFLxyYUuFvm/o2UJnPU8S0aT0vOpDgqFFB2FmCSG3DhdnoD7eN4MXVRmkS KkWTtBt/xabFviseAuDFcoKsE8PLkjiyVk1c0nmASreet8fgdiFqcCEbIbH1DTWBP6oY4N +lyy6UXqty0hJl3WmPZQ45+c3U9TEDOxVJgryHmLb1TLrem+jd5iDTqxbzFsicp2ZxeOr7 i5jAzilx28LFa1nt96pbw5g4d3kcfMwYfQsS1AE5aZZFDGm0nLd6jIX6W3tGE6sYKq1HJu pv+Vm1Apn8cGbaoA7QiC4PYo+qv8R1SocrASPYvoXBFkJHenufA6YqxuMY4YqA== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r1cVA-0005PT-Mn; Fri, 10 Nov 2023 20:09:32 -0500 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 1r1cV2-0005Ox-46 for guix-patches@gnu.org; Fri, 10 Nov 2023 20:09:25 -0500 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 1r1cV1-0001rT-Rr for guix-patches@gnu.org; Fri, 10 Nov 2023 20:09:23 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r1cVe-00066V-Hl; Fri, 10 Nov 2023 20:10:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67009] [PATCH v4] build: minetest-build-system: Improve white space handling in mod name field. References: <034f56289398fd3198b05b0a5a9b0147d64e92ba.1699493581.git.tristan@cott.am> In-Reply-To: <034f56289398fd3198b05b0a5a9b0147d64e92ba.1699493581.git.tristan@cott.am> Resent-From: Tristan Cottam Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Sat, 11 Nov 2023 01:10:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67009 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67009@debbugs.gnu.org Cc: Tristan Cottam , Liliana Marie Prikler , =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= X-Debbugs-Original-Xcc: Liliana Marie Prikler , =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Received: via spool by 67009-submit@debbugs.gnu.org id=B67009.169966499823448 (code B ref 67009); Sat, 11 Nov 2023 01:10:02 +0000 Received: (at 67009) by debbugs.gnu.org; 11 Nov 2023 01:09:58 +0000 Received: from localhost ([127.0.0.1]:51240 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r1cVa-000668-D7 for submit@debbugs.gnu.org; Fri, 10 Nov 2023 20:09:58 -0500 Received: from mail-4330.protonmail.ch ([185.70.43.30]:49299) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r1cVU-00065o-DQ for 67009@debbugs.gnu.org; Fri, 10 Nov 2023 20:09:57 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cott.am; s=protonmail; t=1699664944; x=1699924144; bh=7EHzu5y8FyMk/7xEy7VsW/VXwtFHbrm1Fg+hw7pAyVg=; h=From:To:Cc:Subject:Date:Message-ID:From:To:Cc:Date:Subject: Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=Cu7hxl4S/LGrJNEu7ZmpCPRuby2FIHlDTHEmhYRCYM+3A2wG4tbYSSHFGGFeII0u3 9JtIf+7BlGmUSTyxMoY5ZGOQlgaOoKPccUquxEP9XVOPo/BhklBCJO/rU1YhT3pAS/ dXzrYvvSYolOR9UJMy6tk59QNEA/YwLBjquri+fwJcB/6CoGHfV9+cNbUSQO0AG6F9 hDNGYUb655ZggZKIw7ogBxZ6lDQCPEajynTCUx8xi0rngWWpjFPzIDA1CrhnXDdl6e gvjowS95Lm/JAZI6J8fVgizsLDKVPea2w+l4oQtu/jYnQpgbPPEGp9O29NpR5qqeO/ sL5tF4AW9WJfA== X-Pm-Submission-Id: 4SRyJH44b5z4wwdb Date: Sat, 11 Nov 2023 02:05:08 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 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: , Reply-to: Tristan Cottam X-ACL-Warn: , Tristan Cottam via Guix-patches From: Tristan Cottam via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -4.61 X-Spam-Score: -4.61 X-Migadu-Queue-Id: BF95022FD2 X-Migadu-Scanner: mx10.migadu.com X-TUID: 7oTwc26hHIJy Fixes certain Minetest mods (such as minetest-ambience) being stored with a terminating carriage return in their sub-directory base name. * guix/build/minetest-build-system.scm (name-regexp): Only match graphical characters in the name sub-match. Change-Id: I95f4c201724991a10efba5c859bfef99779ea495 --- I'm unsure exactly how I should refer to a Minetest mod which has yet to be packaged for Guix, so I used the would-be package name of one such mod, which I will contribute along with many others shortly. guix/build/minetest-build-system.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/guix/build/minetest-build-system.scm b/guix/build/minetest-build-system.scm index 4a7a87ab83..3bf083e004 100644 --- a/guix/build/minetest-build-system.scm +++ b/guix/build/minetest-build-system.scm @@ -126,7 +126,8 @@ (define* (minimise-png #:key inputs native-inputs #:allow-other-keys) (/ total-old-size (expt 1024 2)) (/ total-new-size (expt 1024 2))))))) -(define name-regexp (make-regexp "^name[ ]*=(.+)$")) +(define name-regexp + (make-regexp "^name[[:space:]]*=[[:space:]]*([[:graph:]]+)[[:space:]]*$")) (define* (read-mod-name mod.conf #:optional not-found) "Read the name of a mod from MOD.CONF. If MOD.CONF base-commit: b0bfddd7f937fcefdaeb1de4ccafd415c1df4122 -- 2.41.0