From patchwork Sat Nov 11 01:05:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tristan Cottam X-Patchwork-Id: 56249 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 4B87527BBE9; Sat, 11 Nov 2023 01:09:45 +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=unavailable 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 BB32A27BBE2 for ; Sat, 11 Nov 2023 01:09:42 +0000 (GMT) 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?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= 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 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 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 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(-) base-commit: b0bfddd7f937fcefdaeb1de4ccafd415c1df4122 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