From patchwork Thu Nov 9 10:43:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tristan Cottam X-Patchwork-Id: 56134 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 9639F27BBEA; Thu, 9 Nov 2023 14:08:04 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C075D27BBE2 for ; Thu, 9 Nov 2023 14:08:03 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r15g5-0006cd-1K; Thu, 09 Nov 2023 09:06:37 -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 1r12bE-0005kj-Hj for guix-patches@gnu.org; Thu, 09 Nov 2023 05:49:24 -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 1r12bE-0003N7-1Q for guix-patches@gnu.org; Thu, 09 Nov 2023 05:49:24 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r12bp-0004E6-SF; Thu, 09 Nov 2023 05:50:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67009] [PATCH v2] 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: Thu, 09 Nov 2023 10:50:01 +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?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 67009-submit@debbugs.gnu.org id=B67009.169952696616188 (code B ref 67009); Thu, 09 Nov 2023 10:50:01 +0000 Received: (at 67009) by debbugs.gnu.org; 9 Nov 2023 10:49:26 +0000 Received: from localhost ([127.0.0.1]:46842 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r12bF-0004D1-I3 for submit@debbugs.gnu.org; Thu, 09 Nov 2023 05:49:25 -0500 Received: from mail-40112.protonmail.ch ([185.70.40.112]:17707) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r12bB-0004CA-CX for 67009@debbugs.gnu.org; Thu, 09 Nov 2023 05:49:24 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cott.am; s=protonmail; t=1699526914; x=1699786114; bh=tEjwDaRsEenez3ivrUknYMT4UPkhjiXUDB0GvSQT5SU=; h=From:To:Cc:Subject:Date:Message-ID:From:To:Cc:Date:Subject: Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=OlaWVKUfX6mj1JDeSAHeWbm9byPRJaU7gEU+AXCBnL4LrIk0+o2V7J4/1YIoWvdOD 87+PsbRs2U6qgCXo2057H/3GSqoOJA7mhp+B77mJKn0nX/y63kALFkvGusq9naBp6N ZQsB95a/rF3wVUf96fyuMTQ67SFyDPyxdspa2vzG95VrWony8ecVMsf0WJloETcSQU wKOFkZYmopRtZz6GKe0c4zjui4xvzHoDgothy2ybvavj86yoaSsE7WiQ2M2s1CQk5N kgdaloSR03jNcU7WwsxQEaZlV7zzNgpprWCAWrF982VPWudwEcXKMgEECzdRtFnGDJ ODMDykg2HdToA== X-Pm-Submission-Id: 4SQzFs1v3xz1wb Date: Thu, 9 Nov 2023 11:43:01 +0100 Message-ID: <33c8f13583388ce1608d3deef57799041da8d8bc.1699526581.git.tristan@cott.am> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Thu, 09 Nov 2023 09:04:54 -0500 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 X-Patchwork-Original-From: Tristan Cottam via Guix-patches via From: Tristan Cottam Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches On Thursday, November 9th, 2023 at 7:06 AM, Liliana Marie Prikler wrote: > > The new regexp is missing a terminator ($). Should we add > > [[:space:]]$ at the end? > > Ahem, [[:space:]]*$ of course. I didn't include [[:space:]]*$ in case someone decided to append a comment to the same line. However, since Minetest doesn't officially support comments in mod.conf, I think it's safe to include [[:space:]]*$ for clarity. * guix/build/minetest-build-system.scm (name-regexp): Improve white space handling. Change-Id: I95f4c201724991a10efba5c859bfef99779ea495 --- guix/build/minetest-build-system.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) base-commit: b0bfddd7f937fcefdaeb1de4ccafd415c1df4122 diff --git a/guix/build/minetest-build-system.scm b/guix/build/minetest-build-system.scm index 4a7a87ab83..cfeca7d18f 100644 --- a/guix/build/minetest-build-system.scm +++ b/guix/build/minetest-build-system.scm @@ -126,7 +126,7 @@ (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