guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

03/03: build: minetest-build-system: Match name more strictly.


From: guix-commits
Subject: 03/03: build: minetest-build-system: Match name more strictly.
Date: Sat, 11 Nov 2023 01:10:07 -0500 (EST)

lilyp pushed a commit to branch master
in repository guix.

commit 9ce47b6fdd742324f3e7a47fa09b54f6b613b52f
Author: Tristan Cottam <tristan@cott.am>
AuthorDate: Sat Nov 11 02:05:08 2023 +0100

    build: minetest-build-system: Match name more strictly.
    
    Some Minetest mods, such as the hitherto unpackaged minetest-ambience,
    have trailing garbage space (e.g. carriage returns) in their name line,
    that would otherwise end up as part of the mod's directory name.
    
    * guix/build/minetest-build-system.scm (name-regexp): Only match
    graphical characters in the name sub-match.
    
    Change-Id: I95f4c201724991a10efba5c859bfef99779ea495
    Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
---
 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 @@ If it is unknown, make an educated guess."
                    (/ 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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]