From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.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 SE66HVHATGXCcgAAauVa8A:P1 (envelope-from ) for ; Thu, 09 Nov 2023 12:19:45 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id SE66HVHATGXCcgAAauVa8A (envelope-from ) for ; Thu, 09 Nov 2023 12:19:45 +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 44403535CD for ; Thu, 9 Nov 2023 12:19:45 +0100 (CET) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=hxHF9By2; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); 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=1699528785; a=rsa-sha256; cv=none; b=m67OmZg3YlF6Bv8GMBkuYl6HJKvYxHs5SDRAz9f0k7lzBz7ZIggc2/QM9hK5UejPuWOc8C MSUlQVmRrB2mRTuv+yT3NsWbUUhWXy5zFCm2bJJMeKp/n84rvJqQWXKWhfdN+79ZSBZugS vNuHqfHv0Tl+QyDUwJgipcABvNHshLskZZHidbzscX+zDEAxCJYcy/oBWWumaoDvEeWH9u 0PImYshIZmIjS3ACowp1eN5imkXFvyEveohmPPzNnULyELsL3yxr2O9keSmVGtHilSPR7r 9pN7ZA57Fs7I81tfLZr4z7qAT1qmqQsppfyyDvPRiOwxfi3HnQmluvSz2eqz9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1699528785; 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=Aslp3bPhgBWauaEoqG1qc6d0yfz3JIgMBPx3JnDoLck=; b=vASJRxpsIfn/v3CJ/pAs/ZybsrCtSB7EcxQu5d/46JGct+I3fcQ+1YHlWBJHpEXJdI97qt W5WG8Uo8U1pPOq+Ef5qW7Kv0ZAgUu6cFBm4JpV1VK5k/4yfaa0fyUloHXsEzyTtYubDHBX haC4zUNrhtnG09uhgOyvEBgzvbe5agcHoYpf1FMWHHTbcvCrUPHLa1bDXB/59EWzVtc7JB OH7Y59tq0DoyvBvnOSXDh3VQeeFT/CfShcjTQ9BzYTFwRmT81WVuzIRj20sBRfeYddfMiD /bhr5fCdlI0axFfFie2C6e7RSV7rUvnffdviNrY/BPjC1tO9bPCJbIhkL6wk2Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=hxHF9By2; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); 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 1r134G-0005on-JE; Thu, 09 Nov 2023 06:19:24 -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 1r134F-0005oa-G7 for guix-patches@gnu.org; Thu, 09 Nov 2023 06:19:23 -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 1r134F-00011P-7n for guix-patches@gnu.org; Thu, 09 Nov 2023 06:19:23 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r134r-0004yc-VD for guix-patches@gnu.org; Thu, 09 Nov 2023 06:20:01 -0500 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-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-Scanner: mx11.migadu.com X-Spam-Score: 4.39 X-Migadu-Queue-Id: 44403535CD X-Migadu-Spam-Score: 4.39 X-TUID: i9T/5FLPOclt 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