GNU bug report logs - #67009
[PATCH] build: minetest-build-system: Improve white space handling in mod name field.

Previous Next

Full log

View this message in rfc822 format

From: help-debbugs <at> gnu.org (GNU bug Tracking System)
To: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
Cc: tracker <at> debbugs.gnu.org
Subject: bug#67009: closed ([PATCH] build: minetest-build-system: Improve
 white space handling in mod name field.)
Date: Sat, 11 Nov 2023 06:15:02 +0000

[Message part 1 (text/plain, inline)]

Your message dated Sat, 11 Nov 2023 07:13:14 +0100
with message-id <260fa5d89dd6b3ed9c64ec215d5e56500822c2a4.camel <at> gmail.com>
and subject line Re: [bug#67009] [PATCH v4] build: minetest-build-system: Improve white space handling in mod name field.
has caused the debbugs.gnu.org bug report #67009,
regarding [PATCH] build: minetest-build-system: Improve white space handling in mod name field.
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs <at> gnu.org.)


-- 
67009: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=67009
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems

[Message part 2 (message/rfc822, inline)]

From: Tristan Cottam <tristan <at> cott.am>
To: guix-patches <at> gnu.org
Cc: Tristan Cottam <tristan <at> cott.am>
Subject: [PATCH] build: minetest-build-system: Improve white space handling in
 mod name field.
Date: Thu,  9 Nov 2023 02:33:01 +0100

I'm currently developing a Minetest service, with its configuration
including a field specifying the list of mod packages to install and
enable.

However, certain mods' configuration, beind developed on Windows, have a
trailing carriage return before each newline, which is included in the
Guix store mod directory base name. Such mods can't be programmatically
loaded by a Minetest world, since trailing whitespace is ignored by
Minetest's world configuration parser, leading to the wrong mod path
being used.

This patch fixes certain Minetest mods being stored with a terminating
carriage return in their directory base name.

* 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(-)

diff --git a/guix/build/minetest-build-system.scm b/guix/build/minetest-build-system.scm
index 4a7a87ab83..8233d56aca 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:]]+)"))
 
 (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

[Message part 3 (message/rfc822, inline)]

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: Tristan Cottam <tristan <at> cott.am>, 67009-done <at> debbugs.gnu.org
Cc: 宋文武 <iyzsong <at> envs.net>
Subject: Re: [bug#67009] [PATCH v4] build: minetest-build-system: Improve
 white space handling in mod name field.
Date: Sat, 11 Nov 2023 07:13:14 +0100

Am Samstag, dem 11.11.2023 um 02:05 +0100 schrieb Tristan Cottam:
> 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.
Pushed with some rewordings in the commit message.  Feel free to send
the "would-be" packages.

Cheers

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.