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

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 67009 in the body.
You can then email your comments to 67009 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

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 #8 received at 67009 <at> debbugs.gnu.org (full text, mbox):

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

Am Donnerstag, dem 09.11.2023 um 02:33 +0100 schrieb Tristan Cottam:
> 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:]]+)"))
The new regexp is missing a terminator ($).  Should we add [[:space:]]$
at the end?

Cheers

Message #11 received at 67009 <at> debbugs.gnu.org (full text, mbox):

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

Am Donnerstag, dem 09.11.2023 um 07:06 +0100 schrieb Liliana Marie
Prikler:
> Am Donnerstag, dem 09.11.2023 um 02:33 +0100 schrieb Tristan Cottam:
> > 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:]]+)"))
> The new regexp is missing a terminator ($).  Should we add
> [[:space:]]$ at the end?
Ahem, [[:space:]]*$ of course.

Message #14 received at 67009 <at> debbugs.gnu.org (full text, mbox):

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

On Thursday, November 9th, 2023 at 7:06 AM, Liliana Marie Prikler <liliana.prikler <at> gmail.com> 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(-)

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

base-commit: b0bfddd7f937fcefdaeb1de4ccafd415c1df4122
-- 
2.41.0

Message #17 received at 67009 <at> debbugs.gnu.org (full text, mbox):

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

Am Donnerstag, dem 09.11.2023 um 11:43 +0100 schrieb Tristan Cottam:
> On Thursday, November 9th, 2023 at 7:06 AM, Liliana Marie Prikler
> <liliana.prikler <at> gmail.com> 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.
Note: comments that aren't for the commit itself should go below the
dashed (---) line.

> * 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..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:]]*$"))
LGTM, but I'd do a line break + indentation before make-regexp. 
Applied locally with exactly that change; will push unless there's
other comments in the next few days.

Cheers

Message #20 received at 67009 <at> debbugs.gnu.org (full text, mbox):

From: Tristan Cottam <tristan <at> cott.am>
To: 67009 <at> debbugs.gnu.org
Cc: Tristan Cottam <tristan <at> cott.am>
Subject: [PATCH v3] build: minetest-build-system: Improve white space handling
 in mod name field.
Date: Thu,  9 Nov 2023 13:18:55 +0100

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
---

I added the relevant line break and indentation. Can you confirm this
patch is formatted properly this time?

 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

Message #23 received at 67009 <at> debbugs.gnu.org (full text, mbox):

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

Am Donnerstag, dem 09.11.2023 um 13:18 +0100 schrieb Tristan Cottam:
> Fixes certain Minetest mods being stored with a terminating
> carriage return in their directory base name.
Instead of "certain", you might want to name those mods ;)

> * guix/build/minetest-build-system.scm (name-regexp): Improve white
> space handling.
Perhaps describe the actual effect instead of just saying "improve". 
That is: "Only match graphical characters in the name sub-match."

> Change-Id: I95f4c201724991a10efba5c859bfef99779ea495
> ---
> 
> I added the relevant line break and indentation. Can you confirm this
> patch is formatted properly this time?
Yep, it looks properly formatted.

Cheers

Message #26 received at 67009 <at> debbugs.gnu.org (full text, mbox):

From: Tristan Cottam <tristan <at> cott.am>
To: "67009 <at> debbugs.gnu.org" <67009 <at> debbugs.gnu.org>
Subject: [PATCH] build: minetest-build-system: Improve white space handling in
 mod name field.
Date: Fri, 10 Nov 2023 00:59:25 +0000

The only mods I encountered with this problem aren't packaged upstream yet, I only have them in my own channel. Should I contribute them first in order to refer to them by package name?

Message #29 received at 67009 <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: Tristan Cottam <tristan <at> cott.am>, "67009 <at> debbugs.gnu.org"
 <67009 <at> debbugs.gnu.org>
Subject: Re: [PATCH] build: minetest-build-system: Improve white space
 handling in mod name field.
Date: Fri, 10 Nov 2023 18:54:14 +0100

Am Freitag, dem 10.11.2023 um 00:59 +0000 schrieb Tristan Cottam:
> The only mods I encountered with this problem aren't packaged
> upstream yet, I only have them in my own channel. Should I contribute
> them first in order to refer to them by package name?
In that case it would be helpful to follow this improvement up with one
of these mods :)

As long as we're talking free software, upstreaming some minetest mods
shouldn't be too difficult.

Cheers

Message #32 received at 67009 <at> debbugs.gnu.org (full text, mbox):

From: Tristan Cottam <tristan <at> cott.am>
To: 67009 <at> debbugs.gnu.org
Cc: Tristan Cottam <tristan <at> cott.am>
Subject: [PATCH v4] build: minetest-build-system: Improve white space handling
 in mod name field.
Date: Sat, 11 Nov 2023 02:05:08 +0100

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

Message #37 received at 67009-done <at> debbugs.gnu.org (full text, mbox):

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.