From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id eIa8Det2TGXidAAAauVa8A:P1 (envelope-from ) for ; Thu, 09 Nov 2023 07:06:35 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id eIa8Det2TGXidAAAauVa8A (envelope-from ) for ; Thu, 09 Nov 2023 07:06:35 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id BC4C313C33 for ; Thu, 9 Nov 2023 07:06:34 +0100 (CET) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=ESzzNtOj; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1699509995; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=MN2mnnTm1lgv0BXID/zZXIl5cB1rbzSCAzN4ZhGodfc=; b=K+G+ua4oLcR1txK/4+Hc+i1G3cFHBsZwwG8BYT7EKrWsRssuPJuJAQTTcEV0+Gi7Hluzys RtObk/TQXTopZ0rYmHI0FwZ3iWvWmx+jWwJBIklNZw94DxzH0Dv54XfuATfFA+3Slv4IoH 3/GBoMsJG8w9TLXIZBop6d5N6jmHJ+cA+ddPurAlITiXO4QP6dnKX3Yz/qOo1wMhXBSc/f 58L3mO4KrP96vHnCST9qfJtf2H3Z4JwMAh3PJH0wP6Fvs45odVSuryNR15oho6K8htFTKf XXyUd8ZEq9U3L6rqngVO03S/6EqOH2cUyJh8bU2Vcyrn5zwa2cvJBvpxTZfdZg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=ESzzNtOj; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1699509995; a=rsa-sha256; cv=none; b=o8+zVUhGxcpf2I/yNmZjj7avC29rlrVYBLxrdeV/m8+E1muFX70Jh7THIGNzzYeJp94Eiu uUJQlwnEwX1zKVkPNtqkRz+FNwfjred5njy5R6rx7KqRtzRiQeWgWsmxr1lsX4b6Yx1YeX w2z+/K7/ieGe442z/ZgmxtCOGSnYBfHkYV3GNqDfuTAE5cnASy6VzPRgxNqN53CFBRK3yE 55e6Ao2kEkirEYji6+NYylpZ+vJQZWcNYGB6k5UOwIiJgVWm4QqfxLFx7qPKpGTK0fL/Vi s0LFe0Xb9VCUkW23SerwCCWXq4c7vqQolfWCWGFHpQAaS3FR490AGZzA2ZT49A== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r0yBN-0005cb-Vj; Thu, 09 Nov 2023 01:06:26 -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 1r0yBM-0005cQ-Dh for guix-patches@gnu.org; Thu, 09 Nov 2023 01:06:24 -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 1r0yBM-00082w-5V for guix-patches@gnu.org; Thu, 09 Nov 2023 01:06:24 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r0yBy-0002Mw-BX for guix-patches@gnu.org; Thu, 09 Nov 2023 01:07:02 -0500 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-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: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: 4.39 X-Spam-Score: 4.39 X-Migadu-Queue-Id: BC4C313C33 X-Migadu-Scanner: mx13.migadu.com X-TUID: 3TW2jwvDhQN7 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