From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id aLfiIBToTGVadgAAG6o9tA:P1 (envelope-from ) for ; Thu, 09 Nov 2023 15:09:24 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id aLfiIBToTGVadgAAG6o9tA (envelope-from ) for ; Thu, 09 Nov 2023 15:09:24 +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 5D14B3A1B2 for ; Thu, 9 Nov 2023 15:09:24 +0100 (CET) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=cott.am header.s=protonmail header.b=VrwEGIjR; dmarc=pass (policy=none) header.from=gnu.org; 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" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1699538964; a=rsa-sha256; cv=none; b=Gu+vHmTLrqfC1GmAtp9lqip6jaWz7NH5Ijdm8PsDRNQcFufq9fzWNTVjd9wRfIStIMu/iw i411DHTIEkKfdNLJXqz5N8CJ/G/Ynqhqg0ci1CTolKp3nXU//3KHzapFMIOQ772zkGxMWe snQyxPFwqHP0r+XI5lEB6pS+wBNLfw0gUHY+BfdtP69bWgg6yi5EZcjY/FJk6hujeU5SlD j3Xf7KZMfryp8t4hzFWR/gx9WQpprcJBUisKz1xZ2xx5YQGeHBN+Wwj+eYtsm7dJoJrPAM J4qH6hrsSCYW0IWf5H16w+locbkyMlPuQH2B2W35jOqpijQAO5XqAMLp/iJqJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1699538964; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: 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=Dyp3mpNy0R41j6AEplOxtV86cg4W3484UvXkr7Rinmo=; b=ldq1l6DcRTPyHU+PoU4qiu40Tu/7F/+HcIF9Zf+UkU/0ciUh7yUL33IQJMBoJu/Nke8k1F qQnzx/1RaUFJ7ivSuXWTGc3n5PLrT20tM2FBuHtdm0Im6l46x5oL2m2VQn7e1XiPBouMyB twW+Km8ZdrS+WbuH76W02O6GzpsjatOAG+h2IGu7YHhMwtRrhxc/jZi8mDV3l3J0rIwKb9 Xj5WW+W+V0jCDYXhUWwgl7tFxqjsx/hvWYa4OTy8C4xC1uiSGk5Zser9BucRTQyYHf/qXS evhCo9UbUXOkYKBpKF2ErNAhUKszWf8OLNvZtpHIwuCMN8bLg41WANmiX1iViA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=cott.am header.s=protonmail header.b=VrwEGIjR; dmarc=pass (policy=none) header.from=gnu.org; 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" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r15g5-0006kn-OX; Thu, 09 Nov 2023 09:06:37 -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 1r14Bx-0005UD-9f for guix-patches@gnu.org; Thu, 09 Nov 2023 07:31:26 -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 1r14Bx-0000YE-0M for guix-patches@gnu.org; Thu, 09 Nov 2023 07:31:25 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r14CY-0001LQ-DR; Thu, 09 Nov 2023 07:32:02 -0500 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Thu, 09 Nov 2023 09:04:56 -0500 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Tristan Cottam X-ACL-Warn: , Tristan Cottam via Guix-patches From: Tristan Cottam via Guix-patches via 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-Scanner: mx11.migadu.com X-Spam-Score: -3.11 X-Migadu-Queue-Id: 5D14B3A1B2 X-Migadu-Spam-Score: -3.11 X-TUID: mxPlnZdw4Ntu 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