From patchwork Thu Apr 13 11:44:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wicki Gabriel (wicg)" X-Patchwork-Id: 49140 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 44D95174FD; Thu, 13 Apr 2023 12:50:25 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,HTML_MESSAGE, LONG_INVISIBLE_TEXT,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6035D174BB for ; Thu, 13 Apr 2023 12:50:23 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pmvSn-00077j-7u; Thu, 13 Apr 2023 07:50:05 -0400 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 1pmvSl-00077W-C8 for guix-patches@gnu.org; Thu, 13 Apr 2023 07:50:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pmvSl-0005LA-1X for guix-patches@gnu.org; Thu, 13 Apr 2023 07:50:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pmvSk-0006Em-9J for guix-patches@gnu.org; Thu, 13 Apr 2023 07:50:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62814] [PATCH] Clarify substitute* docstring with an additional example Resent-From: "Wicki Gabriel (wicg)" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 13 Apr 2023 11:50:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 62814 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62814@debbugs.gnu.org X-Debbugs-Original-To: "guix-patches@gnu.org" Received: via spool by submit@debbugs.gnu.org id=B.168138656823923 (code B ref -1); Thu, 13 Apr 2023 11:50:02 +0000 Received: (at submit) by debbugs.gnu.org; 13 Apr 2023 11:49:28 +0000 Received: from localhost ([127.0.0.1]:42738 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pmvSB-0006Dn-Sh for submit@debbugs.gnu.org; Thu, 13 Apr 2023 07:49:28 -0400 Received: from lists.gnu.org ([209.51.188.17]:52926) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pmvS8-0006Dd-D5 for submit@debbugs.gnu.org; Thu, 13 Apr 2023 07:49:26 -0400 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 1pmvS6-00075g-TT for guix-patches@gnu.org; Thu, 13 Apr 2023 07:49:22 -0400 Received: from mail-zr0che01on20631.outbound.protection.outlook.com ([2a01:111:f403:4023::631] helo=CHE01-ZR0-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pmvS2-0005DC-HO for guix-patches@gnu.org; Thu, 13 Apr 2023 07:49:21 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Tm22v/c8Yt7aPJHjIkvw2ndjSCkEWnq9ImH0jWjjmlDiV7f1mRgzbcZl+tZt38LCBC3DKrkUFk1jFw2NyxTW8RTnBwFadoWvZnBiIBFhL1OAFTmWH67q19mWxdSTX5Mo/g1rtXv53DyuuTWdKUNUH9IHSPs1svH7jKy9MTN+2Bwxa1yd8C2e9VSnkqMvfpiohn8pQAYXpdzyq/+O5IuUp/gemsENIFqpNkeGGBDgs+z/GXWTKDJemUKtLeJps3iPuToobT79J3tTBZ96ZRQ/Mn1VMDhXWt1j6ftYDs9/g1tazYo6We9YvuWv9KupL/Ekz4LEqhiQ2PEsZUkdJ22Chw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=WjLewwZlEUnp60xnZ8l4PgRACYnks3A6U4kVQ1ykLc0=; b=jgCHYmhs8VblI1Tl9JxCK/IwTUS20UjHb07RSCu69/Fkl+mHKFck+TfZPJBjTJzwnYOik9pjrM8kau08VN8r/zBgTx9AxiM+QVmZfBCvRCnnpd9I0wOGZJb6Bfj0wR/Gy0JewS7G3cqLG26kx4pMtWf9ZQ8HpmhNWIJmQgA7oi3r/Lk6lamsuv2R5SdWhrBaI0vbSyzKXD6E2tw1onoLR48Gz69Y18yhKrHj/ISKW47OuRGvRD9m236S0QDScrRkNFHGKWyirHTQU1i8S8EmyNMlMOvsRVQGZSrO2k31THrca7Vd4TkTlNc8XkVcu2ECtoHBVzylqJUzYi18OWw5yQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=zhaw.ch; dmarc=pass action=none header.from=zhaw.ch; dkim=pass header.d=zhaw.ch; arc=none Received: from ZR0P278MB0268.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:25::9) by ZR0P278MB0773.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:4d::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6298.30; Thu, 13 Apr 2023 11:44:11 +0000 Received: from ZR0P278MB0268.CHEP278.PROD.OUTLOOK.COM ([fe80::fa77:4e58:9bc9:970]) by ZR0P278MB0268.CHEP278.PROD.OUTLOOK.COM ([fe80::fa77:4e58:9bc9:970%9]) with mapi id 15.20.6298.030; Thu, 13 Apr 2023 11:44:11 +0000 From: "Wicki Gabriel (wicg)" Thread-Topic: [PATCH] Clarify substitute* docstring with an additional example Thread-Index: AQHZbfu73z/zkPyL5Euq3G8uVV2Ztg== Date: Thu, 13 Apr 2023 11:44:11 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: yes X-MS-TNEF-Correlator: msip_labels: MSIP_Label_10d9bad3-6dac-4e9a-89a3-89f3b8d247b2_Enabled=True; MSIP_Label_10d9bad3-6dac-4e9a-89a3-89f3b8d247b2_SiteId=5d1a9f9d-201f-4a10-b983-451cf65cbc1e; MSIP_Label_10d9bad3-6dac-4e9a-89a3-89f3b8d247b2_SetDate=2023-04-13T11:44:11.137Z; MSIP_Label_10d9bad3-6dac-4e9a-89a3-89f3b8d247b2_Name=Intern; MSIP_Label_10d9bad3-6dac-4e9a-89a3-89f3b8d247b2_ContentBits=0; MSIP_Label_10d9bad3-6dac-4e9a-89a3-89f3b8d247b2_Method=Standard; authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=zhaw.ch; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: ZR0P278MB0268:EE_|ZR0P278MB0773:EE_ x-ms-office365-filtering-correlation-id: d602e1e9-7566-4b33-e50a-08db3c14662a x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: VhGKPY3dOd59jX211l8L7rh9VvMrNJ10zYJIr2jnw9wNKfCD0PT6jw8MV8wSAx9SrDBYHhDfFmcxtYg7l7t7iRtvJntqDh+uLXO72NMDitnNQbFkqX0Kh49zehi6zZReg1UHLzhajhFfGFN/SCi2r7DcFfLAzLYEGbG87HAQATtSkGqT5yN8y4r/0URO3WnfusyyBY3ZA/tBUZoFOXVyQ4QCUUaJ6YLinQF6rpCpUl6rPqLXJhSZpeUZKQT5QLUmiMgwLc2Ig8k4pgsSRzeGzmoxEjGzaPNNbUFjWG6NV1noA38vyMnDfdGnQt/eS9BMWMjQpMarF2z8z5nYS5OYhu+0LYVE6c+WaBoF88uOyi4FPYwJiLkyJFwzFilLNx7irEV+9fbzgxL4hTuu2JRzJbENc4fHyCha8PReODViigfpK1d7htHjGxz2Ulmht7h369SBJ09zXzeelO3bO3db6ibCayPhwjFvG9TkcEXJEaJNNU6ztYSabVw6/Nmi2M0ia51KpFc4EMDm4JO/4rGOOaYoKJi8fFEp3h/40kWgo2/V62Ozny7tzc2Wl7CnojEnEojCqzRhPlSmnCnpU9rWrhdMFDAvNcRVN09Hw4Wff+7osyDPt5MyhU7kbfENdJ0x x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:ZR0P278MB0268.CHEP278.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230028)(4636009)(376002)(346002)(39860400002)(366004)(136003)(396003)(451199021)(71200400001)(19627405001)(33656002)(38100700002)(122000001)(5660300002)(2906002)(52536014)(786003)(316002)(38070700005)(8676002)(55016003)(8936002)(86362001)(66446008)(66556008)(64756008)(99936003)(41300700001)(66946007)(6916009)(66476007)(76116006)(6506007)(41320700001)(186003)(478600001)(26005)(558084003)(9686003)(7696005); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: mtI+4PkC/5PKjWSEI4CrNweMMiWpJoKGC4E/fEBNWdwLd3i0M6Pkv0lWwJXLBA5VonUTFNkzYv7jMng8aCD2VGVgVNh/Zm9CvaJbILkdcN7PHKCXATgRdbiG3ybp9cO04HkMxRGO4y7ELYiQ7wkGM0fmF0TfohNGaYzIsdP01E6hJTkTg3Ncx7wM/Wr3FefcciF8+p+32CwuMK2zSL5TPgnIYVjLFFJTwHXj+ikQDKoXtJb9G6G9k01j/rCe7wPDnq+WDl6IrwGwOm7bYe9/b2aUPUqIFG3/iwuaLYE3NSTfP0xFixiahJZ3+Q4SnBGHuDw0ziIg4AZqpkoSMnwuy6zwX1/D1uXs5Nk9YzMrbw7xxzG/l4/fuqa0JnYyOwdtwYyJnYwqbXjCTQC17hhpJ1DjS4QGXlD3XRGj8V5BRVY2NeffVirQkaPh2VoPIfQs4/aMGWKPcr/5uCFthlrDxpzKg1pFu+9XJIwjywkyf5HTOcvcxkuDLcWKLyKEnMqwv+kOFvTmwJFoJarECcc60L6g7efwseZaX805nk9fFkemHz4hX962HRTuKJeTBhLfisxnuD/0u8rtAKhvoHtw/lSzl5Q+639SpVoNXBnX/DhqnsN0MMX6A2l38/lOuiZc+fuuzoOuFNvDNcMRojSBmZZKb/XTUcX8K6bC2p84GueoYjfklTkvGxtKU7fQaXcCxxfv4C05hcaEOxmJMc4ur/7jTecvchG8BPadFhaYAxlx/9V0axv5cunrR2ahQqoPlx0iOEhUO6y5cX1KQA9qiet/x3YTkwM/zCiY5XzXXw5+Ut28/PSp1b4LGkTZEvMvgw73XlGByMVv+r2lViqxKzyNGyr3FibJZGNLJMxlguqbESupz6cROaDzLNqKKJhJdl1CWMzA8qsSgXgoFpfdkH8sXPJn7y3JjCQL2+oAapXILeb3V01HbiqBwmMpGDfhyyvjUVi7uvyvlVsdIsj/0ftKuQQMoQhEd/iWHN4ClkBDhlqp4Ijut9P5TzoljtBWM0kr/nfdJUhNySEcKwUv3aBYAkx1X90YY9jScshqjok8caROSW1ccQ1Ab8XXjH9CbGzSTyPCXi9j/NvgRbfsCMmBMMf4zMQDKSRmRlSlMYr3cql6TFKPj2QHj6IHpstu2rWgvG4XYf7rSacwYW4ZK+x75CS/WBek6Zh5crK8rQkffodQCyF3xRzhd4mOgqH9oztm25SJv2Z336d00mq1Sp/VxQjHsl1meSZimhld32FV+MA6rm+5J/jK51UK6JNlhcee63QIUSCXltuhiJqg235jGWCg3fD2aHCOfpWZpniBc8Yg+NxnEdo2UmbPgtnrQVDpCtiPx7cWw45n2t3pxD0gQ2IYIeTNd0QlXja6BYYfzq3ax66wvsbgiYKI2qN9i8qhfl1bHX81TadpL2+rf/VBw5IUZRrA48Dme1sKWyj5rEi7DSNC28GxlYcxdQ8wvauzORxhpkGug2A7wTKP+LVAx51oMfuMiSBPjjyaxrj2DrXTLbGAeOq+ywF0+73lWlyo0m0wic5HKOIetJ9L7A== MIME-Version: 1.0 X-OriginatorOrg: zhaw.ch X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: ZR0P278MB0268.CHEP278.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-Network-Message-Id: d602e1e9-7566-4b33-e50a-08db3c14662a X-MS-Exchange-CrossTenant-originalarrivaltime: 13 Apr 2023 11:44:11.3709 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 5d1a9f9d-201f-4a10-b983-451cf65cbc1e X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: gKSv6exTbIT/SFNhey0UKJufhS+Q1VkvHmCIJ3AjggcPTEYNXtnQSzBZDSyQ/5bM X-MS-Exchange-Transport-CrossTenantHeadersStamped: ZR0P278MB0773 Received-SPF: pass client-ip=2a01:111:f403:4023::631; envelope-from=wicg@zhaw.ch; helo=CHE01-ZR0-obe.outbound.protection.outlook.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, HTML_MESSAGE=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Hello I've created this little patch after wondering how to match (and substitute*) against end-of-line. My patch is based on 982698c52fb388e278dc4cec4b124406f23f102a. Thanks for review and merge. gabber From 5ae3c5512e85189a47c859c6128adfd3bfc63159 Mon Sep 17 00:00:00 2001 From: Gabriel Wicki Date: Thu, 13 Apr 2023 10:31:57 +0200 Subject: [PATCH] guix: build: utils: Clarify substitute* docstring with an example. * guix/build/utils.scm (substitute*): Add an example on how to match end-of-line. * doc/guix.texi (Build Utilities): Update the corresponding passage. --- doc/guix.texi | 3 ++- guix/build/utils.scm | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index acb6f0c2e1..71fa9f1dea 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -10321,7 +10321,8 @@ Alternatively, @var{file} may be a list of file names, in which case they are all subject to the substitutions. Be careful about using @code{$} to match the end of a line; by itself it -won't match the terminating newline of a line. +won't match the terminating newline of a line, e.g. to match a whole +line ending with a backslash, one needs a regex like @code{"(.*)\\\\\n$"}. @end defmac @subsection File Search diff --git a/guix/build/utils.scm b/guix/build/utils.scm index dd5a91f52f..6add9afc1b 100644 --- a/guix/build/utils.scm +++ b/guix/build/utils.scm @@ -957,7 +957,8 @@ (define-syntax substitute* all subject to the substitutions. Be careful about using '$' to match the end of a line; by itself it won't -match the terminating newline of a line." +match the terminating newline of a line, e.g. to match a whole line ending +with a backslash, one needs a regex like \"(.*)\\\\\n$\"." ((substitute* file ((regexp match-var ...) body ...) ...) (let () (define (substitute-one-file file-name) -- 2.39.2