From unknown Sun Jun 15 08:52:57 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#67009] [PATCH] build: minetest-build-system: Improve white space handling in mod name field. 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 05:43:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 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?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Liliana Marie Prikler , =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Received: via spool by submit@debbugs.gnu.org id=B.16995085306419 (code B ref -1); Thu, 09 Nov 2023 05:43:01 +0000 Received: (at submit) by debbugs.gnu.org; 9 Nov 2023 05:42:10 +0000 Received: from localhost ([127.0.0.1]:46553 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r0xnt-0001fS-6g for submit@debbugs.gnu.org; Thu, 09 Nov 2023 00:42:09 -0500 Received: from lists.gnu.org ([2001:470:142::17]:49384) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r0txg-0003m9-3B for submit@debbugs.gnu.org; Wed, 08 Nov 2023 20:36:03 -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 1r0tww-0007B1-OM for guix-patches@gnu.org; Wed, 08 Nov 2023 20:35:14 -0500 Received: from mail-0301.mail-europe.com ([188.165.51.139]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r0tws-0006Sz-Sb for guix-patches@gnu.org; Wed, 08 Nov 2023 20:35:14 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cott.am; s=protonmail; t=1699493703; x=1699752903; bh=4XyzOTSptPvy9k19VqKMMA4NEGxJJOnSLEhwofgRXW0=; h=From:To:Cc:Subject:Date:Message-ID:From:To:Cc:Date:Subject: Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=j2qBp19QSrS6PhPcVfoKjMBYm/i2EcWaJ90rj6ffT7L2p7EoQFTJDeZrxQyYMo1F/ TW/wtnDgYsoagmM7UBSYXfI4XUPRHXNE55beeELzTzVtxy2dxr3/DMhC93VwWylcvz QqipaXqtmkcS4J0x5toScGMPb2Z+JJzktAWcmh49fsCZ7R/4QHuqfkJPfpA33Eauis gmn/cIz7h48WrvPUw/zHC62OSIGWCBkLVO2h/PHfskeV65KpB/sQvKTm3xbnMselLF bSRMXA4gQAPmlM77O0jNN6EYVInj2eQvourjzjEI8PKMqQG1U6RxsHcG5OC0vKnsqe VJTjFTZZjwoBg== X-Pm-Submission-Id: 4SQkzB1G8Zz4wwdK From: Tristan Cottam Date: Thu, 9 Nov 2023 02:33:01 +0100 Message-ID: <034f56289398fd3198b05b0a5a9b0147d64e92ba.1699493581.git.tristan@cott.am> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=188.165.51.139; envelope-from=tristan@cott.am; helo=mail-0301.mail-europe.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.0 (+) X-Mailman-Approved-At: Thu, 09 Nov 2023 00:42:08 -0500 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) 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 From unknown Sun Jun 15 08:52:57 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#67009] [PATCH] build: minetest-build-system: Improve white space handling in mod name field. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 09 Nov 2023 06:07: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: Tristan Cottam , 67009@debbugs.gnu.org Cc: =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Received: via spool by 67009-submit@debbugs.gnu.org id=B67009.16995100129062 (code B ref 67009); Thu, 09 Nov 2023 06:07:02 +0000 Received: (at 67009) by debbugs.gnu.org; 9 Nov 2023 06:06:52 +0000 Received: from localhost ([127.0.0.1]:46565 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r0yBo-0002M6-2M for submit@debbugs.gnu.org; Thu, 09 Nov 2023 01:06:52 -0500 Received: from mail-ed1-x542.google.com ([2a00:1450:4864:20::542]:53300) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r0yBk-0002Ls-Vl for 67009@debbugs.gnu.org; Thu, 09 Nov 2023 01:06:50 -0500 Received: by mail-ed1-x542.google.com with SMTP id 4fb4d7f45d1cf-543c3756521so638414a12.2 for <67009@debbugs.gnu.org>; Wed, 08 Nov 2023 22:06:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699509964; x=1700114764; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=MN2mnnTm1lgv0BXID/zZXIl5cB1rbzSCAzN4ZhGodfc=; b=ESzzNtOj4MxvA6x2FuHl3TmtlHVnO5A6k3Fszri7+xkWBcJQ4x027SxJfb4wTDee5T OQJBqRDmc4ZXZJncCthLmT2wf6Yf44L/KFWOr5fGE0Cm0ssk9FdWMqdGA8RkKqQk7njl WalvnTnvOrgy2MylLOp9mSZTgQfk+/9yfA40GITX+aIYfo88u8+oYKT8u4RqTbP44+w3 2cGYV+JkwtNv5QJ4awNHLio9QG+rq+8wtYPcXxDwDXjIkZd6kdFaQYdw4Dh0S5kws0vQ zZEYS/EY50bmuTDBHXKyY0BW84Pkmyc0HqYUyo8gUZ50KZLDiSO4zJDep7iwPIB+ZQWC Pwig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699509964; x=1700114764; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=MN2mnnTm1lgv0BXID/zZXIl5cB1rbzSCAzN4ZhGodfc=; b=Bapdg2yDNCETbUktomJHpmUZYnC1G5CmA+HI8EHMGU7bxOCmdxKG3YYFGmvPJi7G87 vWv8lXnbkAF+hE2pjFpCTVz1BIQFkvRIehV0GTPcxTvS3VBWCzYJDbeksG2cbs7OSvIF QztP1BT5Assux2KJmPCLRA9OpFQo2JFqru8qHNdxELs5nAqEEgXu3GTE8VYEZuyf8ijQ eYo3uYCxwQX/xZucF5RT0K2RjAvjHH/bOma+YdsOUaxhTkIUcU+X0IV0UDS+PImdyTqf 0NkaC45hTz7a682tBrpu+w7msZr/AL6JOg6QVwNUxaCOXkwF3/h/HD2L5hd3kGGGC8hS mFLw== X-Gm-Message-State: AOJu0Yx9FWxyHZaeL8npKkGzW1GBPU3fZ4cBQp4KhP9mNlicPQg7W5QO EtGQrR6iMDm230+FbMj2VWy9UEUKePfA9w== X-Google-Smtp-Source: AGHT+IHeCLXgN2yd3B/DniSLtb7pLn/XlNvWTg4+BwD7N4/UuxbLelimD6F+gabh3jeDxmY7C4CMYw== X-Received: by 2002:a50:d098:0:b0:544:92f1:83d0 with SMTP id v24-20020a50d098000000b0054492f183d0mr3424103edd.0.1699509963661; Wed, 08 Nov 2023 22:06:03 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id g9-20020aa7d1c9000000b0052febc781bfsm7640587edp.36.2023.11.08.22.06.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Nov 2023 22:06:02 -0800 (PST) Message-ID: From: Liliana Marie Prikler Date: Thu, 09 Nov 2023 07:06:01 +0100 In-Reply-To: <034f56289398fd3198b05b0a5a9b0147d64e92ba.1699493581.git.tristan@cott.am> References: <034f56289398fd3198b05b0a5a9b0147d64e92ba.1699493581.git.tristan@cott.am> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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. >=20 > 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. >=20 > This patch fixes certain Minetest mods being stored with a > terminating > carriage return in their directory base name. >=20 > * guix/build/minetest-build-system.scm (name-regexp): Improve white > space handling. >=20 > Change-Id: I95f4c201724991a10efba5c859bfef99779ea495 > --- > =C2=A0guix/build/minetest-build-system.scm | 2 +- > =C2=A01 file changed, 1 insertion(+), 1 deletion(-) >=20 > 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) > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (/ total-old-size (expt 1024 2)) > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (/ total-new-size (expt 1024 2))= ))))) > =C2=A0 > -(define name-regexp (make-regexp "^name[ ]*=3D(.+)$")) > +(define name-regexp (make-regexp > "^name[[:space:]]*=3D[[:space:]]*([[:graph:]]+)")) The new regexp is missing a terminator ($). Should we add [[:space:]]$ at the end? Cheers From unknown Sun Jun 15 08:52:57 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#67009] [PATCH] build: minetest-build-system: Improve white space handling in mod name field. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 09 Nov 2023 06:08: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: Tristan Cottam , 67009@debbugs.gnu.org Cc: =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Received: via spool by 67009-submit@debbugs.gnu.org id=B67009.16995100629565 (code B ref 67009); Thu, 09 Nov 2023 06:08:01 +0000 Received: (at 67009) by debbugs.gnu.org; 9 Nov 2023 06:07:42 +0000 Received: from localhost ([127.0.0.1]:46569 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r0yCb-0002UD-Hv for submit@debbugs.gnu.org; Thu, 09 Nov 2023 01:07:41 -0500 Received: from mail-ej1-x644.google.com ([2a00:1450:4864:20::644]:51603) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r0yCZ-0002Tx-2I for 67009@debbugs.gnu.org; Thu, 09 Nov 2023 01:07:40 -0500 Received: by mail-ej1-x644.google.com with SMTP id a640c23a62f3a-9be02fcf268so73248766b.3 for <67009@debbugs.gnu.org>; Wed, 08 Nov 2023 22:06:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699510014; x=1700114814; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=Kd4an8PoS9deYyWGKZ6jeOzQiWPKyPpPygpzVmAFpLc=; b=mgL63o74Bsv9I7PEPpgyZa6PR84NyqiUS+lowj/IV6NqcR05acFxSljqim/tl3tYLg DZid0Ptw8ug98jxoqKZPcocuJbnDdaQLAdsqTxA0ULlMyjfnM8diW0sezUpmnmQ/jCzd 3Q/7FSzpBPdmUKz5VWfhwy/cLcOV+ieI1zI0UtKlmVKw7ow9hNAI+aQsn4xceWwhIdcd nYtX6DxJI9n9D0pC9DfPYQiNBIIORX5rrk/KgHlKBNi8vyDGaVcwTd+r8rtcZ+hh/puO or7LVdHr/tAJ6Dt1Tsb3dfD3h0GfCjvODZ0VSMYq7fmIbRtxJ8IW2fPgIiwpEID2NUrs YLkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699510014; x=1700114814; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=Kd4an8PoS9deYyWGKZ6jeOzQiWPKyPpPygpzVmAFpLc=; b=AW0y3hiGAum+vaXHMzqTqusVJJcyM0HLvD07Iu7xBMU5D0M+plldJ6ZM7xOXa7eX1c ync2ZoZtaZzfkQvFM3G/5rEQNyC6/A3b5ZI3M0P7jXjS35lRSdfAbkWq8WRbDV4Owb9R uTfDIywBVO2LOS7qJaQ3XjE6lTYxxH9kxp7a1fhAmelJ+xM+Tfya3FWHEEdodGnWLi4R g7NJSLfSShiwHXUBYsMJqagNwsYhpgL1eJ7SNB01tgqfpDidMUudBfR/Fo78+Uoeym1x c2z4aIGzYdnZvkvroac+I6iX5btnCOpzT+miMEcBWXm2qC7KcrhSN43xYceLe9pYkds+ pJwg== X-Gm-Message-State: AOJu0YzAkQ0f8wSXefqY8Vq9kERmBOUBZfGagiNthMX36TyKqUJzNjbU K9MjDTnIO8z5EUfZHJmYhSM= X-Google-Smtp-Source: AGHT+IEW8MLx9lTCeeG0Q+wJSLrRgtjFb+hFEgEfr98Xfw0WbIrYjzFfu9FGNG/tyALlK8noezA0Rg== X-Received: by 2002:a17:907:c485:b0:9e3:f97b:239e with SMTP id tp5-20020a170907c48500b009e3f97b239emr2751213ejc.29.1699510014109; Wed, 08 Nov 2023 22:06:54 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id a27-20020a1709063a5b00b009c6a4a5ac80sm2039120ejf.169.2023.11.08.22.06.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Nov 2023 22:06:53 -0800 (PST) Message-ID: <332981e6f9645a5b6e3aeb9832fd22ba2526d39d.camel@gmail.com> From: Liliana Marie Prikler Date: Thu, 09 Nov 2023 07:06:52 +0100 In-Reply-To: References: <034f56289398fd3198b05b0a5a9b0147d64e92ba.1699493581.git.tristan@cott.am> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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. > >=20 > > 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. > >=20 > > This patch fixes certain Minetest mods being stored with a > > terminating carriage return in their directory base name. > >=20 > > * guix/build/minetest-build-system.scm (name-regexp): Improve white > > space handling. > >=20 > > Change-Id: I95f4c201724991a10efba5c859bfef99779ea495 > > --- > > =C2=A0guix/build/minetest-build-system.scm | 2 +- > > =C2=A01 file changed, 1 insertion(+), 1 deletion(-) > >=20 > > 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) > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (/ total-old-size (expt 1024 = 2)) > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (/ total-new-size (expt 1024 = 2))))))) > > =C2=A0 > > -(define name-regexp (make-regexp "^name[ ]*=3D(.+)$")) > > +(define name-regexp (make-regexp > > "^name[[:space:]]*=3D[[:space:]]*([[:graph:]]+)")) > The new regexp is missing a terminator ($).=C2=A0 Should we add > [[:space:]]$ at the end? Ahem, [[:space:]]*$ of course. From unknown Sun Jun 15 08:52:57 2025 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?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= X-Debbugs-Original-Xcc: Liliana Marie Prikler , =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= 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 From: Tristan Cottam 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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(-) 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 From unknown Sun Jun 15 08:52:57 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#67009] [PATCH v2] build: minetest-build-system: Improve white space handling in mod name field. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 09 Nov 2023 11:20: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: Tristan Cottam , 67009@debbugs.gnu.org Cc: =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Received: via spool by 67009-submit@debbugs.gnu.org id=B67009.169952879319111 (code B ref 67009); Thu, 09 Nov 2023 11:20:01 +0000 Received: (at 67009) by debbugs.gnu.org; 9 Nov 2023 11:19:53 +0000 Received: from localhost ([127.0.0.1]:46868 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r134i-0004yA-M5 for submit@debbugs.gnu.org; Thu, 09 Nov 2023 06:19:52 -0500 Received: from mail-ed1-x543.google.com ([2a00:1450:4864:20::543]:60791) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r134g-0004xx-Ey for 67009@debbugs.gnu.org; Thu, 09 Nov 2023 06:19:51 -0500 Received: by mail-ed1-x543.google.com with SMTP id 4fb4d7f45d1cf-545ed16b137so383336a12.1 for <67009@debbugs.gnu.org>; Thu, 09 Nov 2023 03:19:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699528745; x=1700133545; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=Aslp3bPhgBWauaEoqG1qc6d0yfz3JIgMBPx3JnDoLck=; b=hxHF9By2vCYhTUR4HGzDQAz25BXJouFehy+GogDHIDRgJ6qlxLpnebEpndMfnExwU1 qhhq4pxYEagInPlIukbURjl3HFsSehBS0WJk9+GWsHFn8kUI5IaEM4m4E1V4WOnemnlW c9f99GKGbXeYPduf2bz7fkMta0NHhfKT8+0KtTsS24SKdooO2yTdeoH5ojcLT3CRlxQ1 gRUjq4AJyQ07GqU1fIoSJfWBy4epBo8VT1LBUdm42b56pzoyGCLP4xotQmDCRRsxKU3+ LLkM6F9q3ctXsRQ9/WTwnbl+NqShc0DbvuI+NmNJuB3xhIrDNJdxFZr8HCMyzStJhJFk xgXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699528745; x=1700133545; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=Aslp3bPhgBWauaEoqG1qc6d0yfz3JIgMBPx3JnDoLck=; b=eS8xX/Rpm8dskdH732pBdi42DsEsR9JUBiuXS3fasTAxAHDy8JlLtcx24yblaG/tRO pxBKnrvojcAd7BLaGo2O9t0aflNbKQAjPaAin/flgUkcRpKjgy3B7r+gNKlbsu/HcqHl gV3mtx1zsNEBe9/vXJKe0NMl9U69s96L0o5nCEWqWkhN0ZXQylK6BalwyVS0CAh+9yHm udgd7gX1ikKHhcldE4e/ydTNUjmIWGEc8oywmfmqJJ99eWWqwlJcZNxIjQOHOVw6X5w4 JTohfWPPFXCXfjhXs9Pwa55Vk17rKJxzJXscxebjBR5mTlxZ99Ir9VrP6+etfJkguu0H 7oSQ== X-Gm-Message-State: AOJu0YxJbdnMtVlpEefqG1kI1QOoV3DjZQV6h1ZzFruwYNpqxUUWaAgi JI1voY/7OskNhuarbwOPy1g= X-Google-Smtp-Source: AGHT+IG8HwKzEXBhzhsZtT/yjM4jhXUE6bhwb+5lYEy7roH/QiQeF2UB/751wCGeOcpfQqzPMnlydg== X-Received: by 2002:a50:8ad4:0:b0:543:caf5:46d4 with SMTP id k20-20020a508ad4000000b00543caf546d4mr3826081edk.37.1699528745275; Thu, 09 Nov 2023 03:19:05 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id n23-20020a5099d7000000b00542db304680sm8101956edb.63.2023.11.09.03.19.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Nov 2023 03:19:04 -0800 (PST) Message-ID: From: Liliana Marie Prikler Date: Thu, 09 Nov 2023 12:19:02 +0100 In-Reply-To: <33c8f13583388ce1608d3deef57799041da8d8bc.1699526581.git.tristan@cott.am> References: <034f56289398fd3198b05b0a5a9b0147d64e92ba.1699493581.git.tristan@cott.am> <33c8f13583388ce1608d3deef57799041da8d8bc.1699526581.git.tristan@cott.am> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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 > wrote: >=20 > > > The new regexp is missing a terminator ($). Should we add > > > [[:space:]]$ at the end? > >=20 > > Ahem, [[:space:]]*$ of course. >=20 > 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. >=20 > Change-Id: I95f4c201724991a10efba5c859bfef99779ea495 > --- > =C2=A0guix/build/minetest-build-system.scm | 2 +- > =C2=A01 file changed, 1 insertion(+), 1 deletion(-) >=20 > 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) > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (/ total-old-size (expt 1024 2)) > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (/ total-new-size (expt 1024 2))= ))))) > =C2=A0 > -(define name-regexp (make-regexp "^name[ ]*=3D(.+)$")) > +(define name-regexp (make-regexp > "^name[[:space:]]*=3D[[:space:]]*([[:graph:]]+)[[:space:]]*$")) LGTM, but I'd do a line break + indentation before make-regexp.=20 Applied locally with exactly that change; will push unless there's other comments in the next few days. Cheers From unknown Sun Jun 15 08:52:57 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#67009] [PATCH v3] 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 12:32: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?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= X-Debbugs-Original-Xcc: Liliana Marie Prikler , =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Received: via spool by 67009-submit@debbugs.gnu.org id=B67009.16995330614898 (code B ref 67009); Thu, 09 Nov 2023 12:32:02 +0000 Received: (at 67009) by debbugs.gnu.org; 9 Nov 2023 12:31:01 +0000 Received: from localhost ([127.0.0.1]:46958 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r14BZ-0001Gn-6u for submit@debbugs.gnu.org; Thu, 09 Nov 2023 07:31:01 -0500 Received: from mail-40110.protonmail.ch ([185.70.40.110]:15985) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r14BV-0000xY-9L for 67009@debbugs.gnu.org; Thu, 09 Nov 2023 07:31:00 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cott.am; s=protonmail; t=1699533011; x=1699792211; bh=Dyp3mpNy0R41j6AEplOxtV86cg4W3484UvXkr7Rinmo=; h=From:To:Cc:Subject:Date:Message-ID:From:To:Cc:Date:Subject: Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=VrwEGIjREx/g47K5hr7WUUVXN9V8gAwl1MHhC1Ai3OrZQeMpQkywHjbEIK2YwAqNt OR6Tuho+MWN8dZ4jADp5sH2pkQ0A6VL0GhrFbwcGncrqV40uLJRSElLzgO7OS0mv+c feHzgAoiKGRQbxfdYNs4pvsYO3/E/XzGUzbAmr0wW04NHy1gXtqbOBT8aWOysAk0RA 0XBsK3CsS3TV33pI0qT+t90EwKxHIXaF8aF11epH92e+P4M2o1QChNpgHYBW3T8cd3 k2kG4QSer3Or04GHSlcFMdejGWRZ0PjfSeOODyepM0LZuajzFu8Wm8tzprMa0VxGT2 lmE4nZ4iZIBPA== X-Pm-Submission-Id: 4SR1W54y1WzDMb From: Tristan Cottam Date: Thu, 9 Nov 2023 13:18:55 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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 From unknown Sun Jun 15 08:52:57 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#67009] [PATCH v3] build: minetest-build-system: Improve white space handling in mod name field. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 09 Nov 2023 13:08: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: Tristan Cottam , 67009@debbugs.gnu.org Cc: =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Received: via spool by 67009-submit@debbugs.gnu.org id=B67009.16995352419064 (code B ref 67009); Thu, 09 Nov 2023 13:08:01 +0000 Received: (at 67009) by debbugs.gnu.org; 9 Nov 2023 13:07:21 +0000 Received: from localhost ([127.0.0.1]:46980 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r14kj-0002M8-5g for submit@debbugs.gnu.org; Thu, 09 Nov 2023 08:07:21 -0500 Received: from mail-lf1-x142.google.com ([2a00:1450:4864:20::142]:50605) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r14ke-0002Lr-Lf for 67009@debbugs.gnu.org; Thu, 09 Nov 2023 08:07:20 -0500 Received: by mail-lf1-x142.google.com with SMTP id 2adb3069b0e04-507975d34e8so1146513e87.1 for <67009@debbugs.gnu.org>; Thu, 09 Nov 2023 05:06:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699535191; x=1700139991; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=KUcP/Sm47E2TIF+hzus9ENB/eUTmLKTTciY7IxkMoZ8=; b=aPiAoVRg8/6ucEDZsxOrtCV85ZO4zWmlagVVOKkVUYbIq6VTlEMOifxr512utUXa+s qvZODWh5PgKIQ4UuVsrYCxtVP5A7/nLmEgAQ6Kyjl5+TubHBW29C9ITZe2tg9VKEWuC9 3Qrt2B6FWJ7025o0TLXBUPuZcgfACWcjatM/OBbgq89AWIWaoQRwalJ0IxZ+cHqobW4z JuJBCm8X4DmKFt3iuBS3qwN4ZoispxOqyMDoqD8IgWoprkD7bJictWIlBnWgdrP2PSOy XDplgLcFYHAiu2Ah+ax0cB8JDZBI88SR3OuG1VQn7O2LXi3y4eKjCn8OoamoypMngRPc Z9qA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699535191; x=1700139991; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=KUcP/Sm47E2TIF+hzus9ENB/eUTmLKTTciY7IxkMoZ8=; b=vi3gsIBfNFd3M8Y97SCiNrBeQ2Dx3D1qaFI19ERIg0qXCrj0m3gPcx5NFQGwnzJXuI A0iyX8W3BJLYhwF495PabEDj00eu8k2VNnJYU+J40cDQt3B2GZ1YGI4iQHzU6EYFHg5l PuFIik9cqVhXhuFPdxPNoWGl2Lhycwvi9SKhhRzC75mSE11R/ky/W6X2EiqEHSSDPOCU AAaDbjV5MecPhRtkOTxu5O20KNfpv/FkrD3XC7WYNLHynjZZ7YMoEfRmg782Z2EZhGmM 4jZ+Nx7WeUxlIoo4bCLM3Vlsn5wlXR8S1I6V4W2JBDo2aPir4zQeG6s44jYuZ+KYgeh3 jy0g== X-Gm-Message-State: AOJu0Yz11vVc0IN5TWbKj2gJq6Yi2YolCFf1wW6WmKOQ0ZJQvv9wfm0I bCxf5w9GcGtWZwhmouOMcgo= X-Google-Smtp-Source: AGHT+IEu6SC9oUx1nX0sVGoeHaafrbT1Bp4Yj8qLILfQx9GNpJ7JbNOg3kCWiUPmviyJ4QcOmFGpaw== X-Received: by 2002:a19:9159:0:b0:509:1301:8470 with SMTP id y25-20020a199159000000b0050913018470mr1349401lfj.45.1699535191264; Thu, 09 Nov 2023 05:06:31 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id w5-20020a05640234c500b005402748cf29sm8046272edc.50.2023.11.09.05.06.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Nov 2023 05:06:30 -0800 (PST) Message-ID: <068b8e261b472406502f17b4a30339e05e0659eb.camel@gmail.com> From: Liliana Marie Prikler Date: Thu, 09 Nov 2023 14:06:29 +0100 In-Reply-To: References: <034f56289398fd3198b05b0a5a9b0147d64e92ba.1699493581.git.tristan@cott.am> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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".=20 That is: "Only match graphical characters in the name sub-match." > Change-Id: I95f4c201724991a10efba5c859bfef99779ea495 > --- >=20 > I added the relevant line break and indentation. Can you confirm this > patch is formatted properly this time? Yep, it looks properly formatted. Cheers From unknown Sun Jun 15 08:52:57 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#67009] [PATCH] build: minetest-build-system: Improve white space handling in mod name field. Resent-From: Tristan Cottam Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 10 Nov 2023 01:01: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" <67009@debbugs.gnu.org> Received: via spool by 67009-submit@debbugs.gnu.org id=B67009.169957803513457 (code B ref 67009); Fri, 10 Nov 2023 01:01:02 +0000 Received: (at 67009) by debbugs.gnu.org; 10 Nov 2023 01:00:35 +0000 Received: from localhost ([127.0.0.1]:49202 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r1Fsw-0003Uz-Rk for submit@debbugs.gnu.org; Thu, 09 Nov 2023 20:00:35 -0500 Received: from mail-4317.proton.ch ([185.70.43.17]:60761) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r1Fst-0003Ui-0K for 67009@debbugs.gnu.org; Thu, 09 Nov 2023 20:00:34 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cott.am; s=protonmail; t=1699577984; x=1699837184; bh=IgVSnI3JuF2zZ9wVYJGb/quEuvY7rS4+QkXylVXSfK8=; h=Date:To:From:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=AKWn6SPnm2fkREO/tNc3zurvoT0u+RF+5PyVVp1bvZOUK7rJ+Izk4DJxT8lMgFdod xqoUhQtlrUdcnYAqLAmgwkGUDtkxsPQUrQZ1sNxqxXp9Nvon9wlr/J0RYecqqgn0s1 mmCyZidw3mTk//iXGAdtRPGsidcSBR5yQmwm4hQ856WkDwADRUp+UPy4dzrQdhWKC2 BsmDzXyseXvLzDisGvL1OhjFxa0d4QiVjqfN/kR0gMUXqRpjNJBw/gZdtOQr6a965J meLpINmbHT0/yz44LodBojJm0PIKx36kdqgi50HGHk1qKPj34amJf4fafq6FndegU1 sYPfmQzLz52PQ== Date: Fri, 10 Nov 2023 00:59:25 +0000 From: Tristan Cottam Message-ID: <52GWSEkIAfwhhC3Omu3CYqBOZI0D5c0e2iyvQaGsvqhiLibFkuciScvZk-35eA_Z8rkRzbMKhuol0AxRvxgYdDLCnuAaXj3ipjq5-3j2YmE=@cott.am> In-Reply-To: References: <034f56289398fd3198b05b0a5a9b0147d64e92ba.1699493581.git.tristan@cott.am> <068b8e261b472406502f17b4a30339e05e0659eb.camel@gmail.com> Feedback-ID: 91216129:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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 orde= r to refer to them by package name? From unknown Sun Jun 15 08:52:57 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#67009] [PATCH] build: minetest-build-system: Improve white space handling in mod name field. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 10 Nov 2023 17:56: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: Tristan Cottam , "67009@debbugs.gnu.org" <67009@debbugs.gnu.org> Received: via spool by 67009-submit@debbugs.gnu.org id=B67009.169963891311129 (code B ref 67009); Fri, 10 Nov 2023 17:56:01 +0000 Received: (at 67009) by debbugs.gnu.org; 10 Nov 2023 17:55:13 +0000 Received: from localhost ([127.0.0.1]:50830 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r1Vio-0002tO-Kg for submit@debbugs.gnu.org; Fri, 10 Nov 2023 12:55:13 -0500 Received: from mail-lf1-x130.google.com ([2a00:1450:4864:20::130]:55437) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r1Vii-0002sl-88 for 67009@debbugs.gnu.org; Fri, 10 Nov 2023 12:55:08 -0500 Received: by mail-lf1-x130.google.com with SMTP id 2adb3069b0e04-507a0907896so3008246e87.2 for <67009@debbugs.gnu.org>; Fri, 10 Nov 2023 09:54:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699638858; x=1700243658; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:from:to:cc:subject:date :message-id:reply-to; bh=z9lHBWp9pYGUoh7B2PeIA6jmXV9krosu5gIa03vi3SY=; b=LIZbPvY6w8GmSXO5r9lJOXr8DKyTufzeN8SvEFlHbDriKrDD1N0bENEbNuF+M/85PG 92NkEDi8F9qsn5yeHcI0O/J9R5C8DKNs0NwahIrAujSdYDq1aNBfvifZ8VuzzzWlbTF0 rEe74Uj6Hpfq3mVIujZDjtRMkFcVu8mo4LiOOz4D9I1G0vs1FYIe5E0W+WeNHcaxPX5D QwJuRxwdTqqZyHVqcQjVrwrvEjYEwHyKS1A5Fd9lej4062MJ52sr7a0YLB0M8zmz2oUO MlWfZrW/1BDTVbxzY6/d8D6QTz6oprdXQL7Mp7AyboskRT5GmuYM4ISrR/F7Mv8Sptjt VEFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699638858; x=1700243658; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=z9lHBWp9pYGUoh7B2PeIA6jmXV9krosu5gIa03vi3SY=; b=dRyaQVaAYJ0GBIo6x5aIIjykoK131pCVihsSH3Jsr7YFm5+rReydZR8iut7UUQXNas 5kPkdI9OiDhVZS8mF5cK2PAhWfgW9JUiNrvySepUD6xsM5DviXXELcfNd9TAcfHKnnvE f7NWOqE1aPydILogynhHBToxKrWDFVrIOoSV/s9fcoNx7tDv+kAWpdjqadmjqTKcL9te lAd/m1g/HjmZGKDxcYlLnKXasybf6UQ7mWVTe9Wp8+2pjlsTc2jbK1MNoVwmvpmP2SzT LscoG9zFm5tcVZ0u3xv4QYQMPBj07e+/onxgmDb7K8D34OgY8Pm/oyF3qA2DbTP9TC0A LE6g== X-Gm-Message-State: AOJu0Yzytg92bMHhG6HN728E/P+yWaC/6VCI3GNVKTHkV15xx3WWWXoj NgiyEuwSE+2s9AB2AGaxiCk= X-Google-Smtp-Source: AGHT+IH9honfE0tkAz/23ulInyojcbbRZRAF2vTwm1FwXgsipYgMXYMd/lckknHDVuS9oy8f9b9Sxw== X-Received: by 2002:a19:790b:0:b0:506:9304:570b with SMTP id u11-20020a19790b000000b005069304570bmr3971413lfc.14.1699638857630; Fri, 10 Nov 2023 09:54:17 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id x23-20020a170906299700b009ae587ce133sm4171766eje.188.2023.11.10.09.54.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Nov 2023 09:54:16 -0800 (PST) Message-ID: From: Liliana Marie Prikler Date: Fri, 10 Nov 2023 18:54:14 +0100 In-Reply-To: <52GWSEkIAfwhhC3Omu3CYqBOZI0D5c0e2iyvQaGsvqhiLibFkuciScvZk-35eA_Z8rkRzbMKhuol0AxRvxgYdDLCnuAaXj3ipjq5-3j2YmE=@cott.am> References: <034f56289398fd3198b05b0a5a9b0147d64e92ba.1699493581.git.tristan@cott.am> <068b8e261b472406502f17b4a30339e05e0659eb.camel@gmail.com> <52GWSEkIAfwhhC3Omu3CYqBOZI0D5c0e2iyvQaGsvqhiLibFkuciScvZk-35eA_Z8rkRzbMKhuol0AxRvxgYdDLCnuAaXj3ipjq5-3j2YmE=@cott.am> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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 From unknown Sun Jun 15 08:52:57 2025 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?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= X-Debbugs-Original-Xcc: Liliana Marie Prikler , =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= 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 From: Tristan Cottam Date: Sat, 11 Nov 2023 02:05:08 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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 From unknown Sun Jun 15 08:52:57 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Tristan Cottam Subject: bug#67009: closed (Re: [bug#67009] [PATCH v4] build: minetest-build-system: Improve white space handling in mod name field.) Message-ID: References: <260fa5d89dd6b3ed9c64ec215d5e56500822c2a4.camel@gmail.com> <034f56289398fd3198b05b0a5a9b0147d64e92ba.1699493581.git.tristan@cott.am> X-Gnu-PR-Message: they-closed 67009 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 67009@debbugs.gnu.org Date: Sat, 11 Nov 2023 06:15:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1699683302-22026-1" This is a multi-part message in MIME format... ------------=_1699683302-22026-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #67009: [PATCH] build: minetest-build-system: Improve white space handling = in mod name field. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 67009@debbugs.gnu.org. --=20 67009: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D67009 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1699683302-22026-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 67009-done) by debbugs.gnu.org; 11 Nov 2023 06:14:08 +0000 Received: from localhost ([127.0.0.1]:51352 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r1hFv-0005i0-MT for submit@debbugs.gnu.org; Sat, 11 Nov 2023 01:14:07 -0500 Received: from mail-ed1-x543.google.com ([2a00:1450:4864:20::543]:58799) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r1hFt-0005hN-H5 for 67009-done@debbugs.gnu.org; Sat, 11 Nov 2023 01:14:06 -0500 Received: by mail-ed1-x543.google.com with SMTP id 4fb4d7f45d1cf-53f9af41444so4613924a12.1 for <67009-done@debbugs.gnu.org>; Fri, 10 Nov 2023 22:13:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699683199; x=1700287999; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=i8THArZY9S3U6VJHztOXfQlgcHs6CwZ7ujhnYqLY1Kg=; b=L8i9FJKFZuxlIE0sMji1Up7+23WtrW86okN9jrUvLOtt2WwjA9ojdPwNGtLB8cpUvv R0kqwJWRriVz7oo2XSF2qMvCvCwe5qsc/yqU7f6g2Ff3Gu0yLZMdaKM+o1vLEmFQ1m0Q j0POrZKp8ALqlgCJcSh4Wanji7VOB89mPeVk2nuWRYAfS1bBmuRCEUZliATTQYgm5Di4 e/N8Yv7POjwD9Oe4fIVRy/8ZxovWamdXLGxGpqpNCbI/YgyP+5C6/A7m1tlB17t/8+et nAc8Rxp1Tjupc16TydU8+81njZv4g4twewkg192bOP0sm3skWOpuF7V2p8yeAiKK3XDC LH2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699683199; x=1700287999; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=i8THArZY9S3U6VJHztOXfQlgcHs6CwZ7ujhnYqLY1Kg=; b=U8YIr6XHghsg5Bcz1lnjqAMOhDaxZQb4/IhgualTLNJeJHjDGCCQEg0DG87/DTUBMl PiUnH1r5s8epH6XQ+sSMQgKl8JijjzIbS3b6CVMkDBiQtHIXYrXSb5j0usv1PbVyS9cQ y14Eqc3JpeSjXZ76N10yExB5xaJm1pB8Tu62rWHC8YsTkVC7MKDFG6RN4jJhxQ4MUeri vcAm3YcAP3idrIZBOPKnVbLg3CUQ1gF7sH7sWg7IzD4Hh6ADpwI6n6OisuAoUoWmIAoz x7bYVU0kCxdQ4Z9+WaczgkvAnimx/zaW91hLTEU2M6X+QG8gfNdQciFyZZUlNJBbsOEe x/Iw== X-Gm-Message-State: AOJu0YwszgMtff2rOCRAPJAc8GvMLCatGZGGtuIJPHIoEETl/9rLtTIb QmPjyx2hpV5ttm8PZGdN4Fw= X-Google-Smtp-Source: AGHT+IF5o0Gdoh0wDckUIh1f0EZ1fPY35oD6A4InLr8eapgt6y3nDZ6VRu6lJFTWGCiRacgC75HmHg== X-Received: by 2002:a17:907:7ea7:b0:9e4:7d6:3730 with SMTP id qb39-20020a1709077ea700b009e407d63730mr544604ejc.11.1699683199191; Fri, 10 Nov 2023 22:13:19 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id dx5-20020a170906a84500b0099bd1a78ef5sm552012ejb.74.2023.11.10.22.13.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Nov 2023 22:13:17 -0800 (PST) Message-ID: <260fa5d89dd6b3ed9c64ec215d5e56500822c2a4.camel@gmail.com> Subject: Re: [bug#67009] [PATCH v4] build: minetest-build-system: Improve white space handling in mod name field. From: Liliana Marie Prikler To: Tristan Cottam , 67009-done@debbugs.gnu.org Date: Sat, 11 Nov 2023 07:13:14 +0100 In-Reply-To: References: <034f56289398fd3198b05b0a5a9b0147d64e92ba.1699493581.git.tristan@cott.am> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 67009-done Cc: =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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. >=20 > * guix/build/minetest-build-system.scm (name-regexp): Only match > graphical characters in the name sub-match. >=20 > Change-Id: I95f4c201724991a10efba5c859bfef99779ea495 > --- >=20 > 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 ------------=_1699683302-22026-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 9 Nov 2023 05:42:10 +0000 Received: from localhost ([127.0.0.1]:46553 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r0xnt-0001fS-6g for submit@debbugs.gnu.org; Thu, 09 Nov 2023 00:42:09 -0500 Received: from lists.gnu.org ([2001:470:142::17]:49384) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r0txg-0003m9-3B for submit@debbugs.gnu.org; Wed, 08 Nov 2023 20:36:03 -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 1r0tww-0007B1-OM for guix-patches@gnu.org; Wed, 08 Nov 2023 20:35:14 -0500 Received: from mail-0301.mail-europe.com ([188.165.51.139]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r0tws-0006Sz-Sb for guix-patches@gnu.org; Wed, 08 Nov 2023 20:35:14 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cott.am; s=protonmail; t=1699493703; x=1699752903; bh=4XyzOTSptPvy9k19VqKMMA4NEGxJJOnSLEhwofgRXW0=; h=From:To:Cc:Subject:Date:Message-ID:From:To:Cc:Date:Subject: Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=j2qBp19QSrS6PhPcVfoKjMBYm/i2EcWaJ90rj6ffT7L2p7EoQFTJDeZrxQyYMo1F/ TW/wtnDgYsoagmM7UBSYXfI4XUPRHXNE55beeELzTzVtxy2dxr3/DMhC93VwWylcvz QqipaXqtmkcS4J0x5toScGMPb2Z+JJzktAWcmh49fsCZ7R/4QHuqfkJPfpA33Eauis gmn/cIz7h48WrvPUw/zHC62OSIGWCBkLVO2h/PHfskeV65KpB/sQvKTm3xbnMselLF bSRMXA4gQAPmlM77O0jNN6EYVInj2eQvourjzjEI8PKMqQG1U6RxsHcG5OC0vKnsqe VJTjFTZZjwoBg== X-Pm-Submission-Id: 4SQkzB1G8Zz4wwdK From: Tristan Cottam To: guix-patches@gnu.org Subject: [PATCH] build: minetest-build-system: Improve white space handling in mod name field. Date: Thu, 9 Nov 2023 02:33:01 +0100 Message-ID: <034f56289398fd3198b05b0a5a9b0147d64e92ba.1699493581.git.tristan@cott.am> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Debbugs-Cc: Liliana Marie Prikler , 宋文武 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=188.165.51.139; envelope-from=tristan@cott.am; helo=mail-0301.mail-europe.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: submit X-Mailman-Approved-At: Thu, 09 Nov 2023 00:42:08 -0500 Cc: Tristan Cottam X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) 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 ------------=_1699683302-22026-1--