From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id YGlfEyUbb2EbuwAAgWs5BA (envelope-from ) for ; Tue, 19 Oct 2021 21:23:17 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id yKoPDyUbb2EiQQAA1q6Kng (envelope-from ) for ; Tue, 19 Oct 2021 19:23:17 +0000 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 BFFE32F671 for ; Tue, 19 Oct 2021 21:23:16 +0200 (CEST) Received: from localhost ([::1]:54024 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mcuhf-0004aZ-SQ for larch@yhetil.org; Tue, 19 Oct 2021 15:23:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54086) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mcuhT-0004aH-Gh for bug-guix@gnu.org; Tue, 19 Oct 2021 15:23:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40495) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mcuhT-0006Hr-3c for bug-guix@gnu.org; Tue, 19 Oct 2021 15:23:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mcuhR-000650-Py for bug-guix@gnu.org; Tue, 19 Oct 2021 15:23:01 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#51258: [PATCH v2] gnu: emacs: Handle pdump filenames that contain a fingerprint References: In-Reply-To: Resent-From: Morgan.J.Smith@outlook.com Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Tue, 19 Oct 2021 19:23:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51258 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 51258@debbugs.gnu.org, paxton@riseup.net, liliana.prikler@gmail.com Received: via spool by 51258-submit@debbugs.gnu.org id=B51258.163467136623346 (code B ref 51258); Tue, 19 Oct 2021 19:23:01 +0000 Received: (at 51258) by debbugs.gnu.org; 19 Oct 2021 19:22:46 +0000 Received: from localhost ([127.0.0.1]:52041 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mcuhC-00064T-88 for submit@debbugs.gnu.org; Tue, 19 Oct 2021 15:22:46 -0400 Received: from mail-co1nam11olkn2015.outbound.protection.outlook.com ([40.92.18.15]:22369 helo=NAM11-CO1-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mcuh9-00064F-Sy for 51258@debbugs.gnu.org; Tue, 19 Oct 2021 15:22:44 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ttt8MJfAPIBF4LgEFrYO5Z2Z3GxAxQnKd040SQkYUnKnIriPnbovKU6Tf9v7afaNjvPzSaRjpYek0wyrscrk+kv1nxIqtrMaoVS/Fdc3M4oB8RSRX9oVssPGKCqOf7+3/GduLDT9ET7mq7npRhxidR3sHqDGfXzmsOWihZdk1R1BKwHFTNWMbhtJYkCtFSZqoIGSeRmVro9nNAU4Hms8g31mdxDPOgO5oe9EyuuY9wNqRs7LlS7OpWI+1yLtmn6vUPsIoKwIizb9YIqiIZtQqJTlgAC12t0GbWlEBfk06ARF9CM6Yvlr7uLnJhLrtrurs6V0UZDDh52VvWg1VFkHIA== 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=Wni8A3qDM2b0EN04sYAYhg9PS+qFHvJpy387YkDA6GM=; b=XycRAmqlnKjnVZgoew3h4K4ch+QSFjbwntIAqLOV+6emx2T/DQA8PkIUA/HXkwXpwci/+nglUwFIgfRQ88wqimi/le+LvSoOO05itTXJ9F8JQf/z3Dd24O2FyurX/KwSgTw+G0hGbW7wzilAYo8p1I3csbKkYNPKUGGCYlW98L3AI7MtEEzVlY38BwBbGPYL1AazdENrmmmEM8qXjLBbdbEXHJfKypRbYz8UxdktsNmwzT+cab3ESfb0N/RoUNPvuUY8P6m6HDGaPuqV3FplP5uwOU5TUMImSFw5oLSVBSTzslpQJnpgfp+u9Sajaiy5BsuF3WNmUB7ZYrthvHZWRQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Wni8A3qDM2b0EN04sYAYhg9PS+qFHvJpy387YkDA6GM=; b=dWiOKXZjOVNB81pcIjJKWlh+tSYnqDM5dMBywVymXoCTwRJBC2k1XqeDCTUjwdPn81/O79FESPn8ZyAvn5Kx4io8iQztlonT7F0kOTe1sp2dSulzR2PSbZ7uf11XnDw8Sa0lei5JsrybtqDC5yXwC7VXWcYCmgw8NYCtnZVnw1K1mNHbz43SiQHK5ZJhYW9TtemWdM6dmws56ktz+gFANiQofMK6Hjm1pZouf0mCne0PUwvR23dcpW02vgDbtYTf+T2A0+alZJxYajG1W4GtaNkHk3uK//+S9S+/Z00+n70qzttKZYmVvwqh5tKxMDsOiStVxtvmsD+2pT+3hyI8lQ== Received: from BYAPR05MB4023.namprd05.prod.outlook.com (2603:10b6:a02:87::30) by BYAPR05MB4855.namprd05.prod.outlook.com (2603:10b6:a03:4f::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.9; Tue, 19 Oct 2021 19:22:37 +0000 Received: from BYAPR05MB4023.namprd05.prod.outlook.com ([fe80::745d:ce8d:67ec:5154]) by BYAPR05MB4023.namprd05.prod.outlook.com ([fe80::745d:ce8d:67ec:5154%6]) with mapi id 15.20.4628.015; Tue, 19 Oct 2021 19:22:37 +0000 From: Morgan.J.Smith@outlook.com Date: Tue, 19 Oct 2021 15:10:09 -0400 Message-ID: X-Mailer: git-send-email 2.33.1 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-TMN: [jT5wSWdWf0ErjH9Cgc4X+rgI5LLPYnvi] X-ClientProxiedBy: YQBPR0101CA0096.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:4::29) To BYAPR05MB4023.namprd05.prod.outlook.com (2603:10b6:a02:87::30) X-Microsoft-Original-Message-ID: <20211019191007.3108-1-Morgan.J.Smith@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (170.52.80.188) by YQBPR0101CA0096.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:4::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.15 via Frontend Transport; Tue, 19 Oct 2021 19:22:35 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cecfbf4f-c6c5-4eb4-1abe-08d99335cf08 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNXwBRntoGkOsgz/xfgMzmJZSgPOvvdwosW514JZ9sDRYyq6guK6eDApW+lNFJXBLbdbr6wNzxGx53fqxYrNSSGkVRiqiRnsrXgaNZW25TXe2LzP40xQG33Kw+HKaiRGNNFgYIzk56rJD0JA2rdDt+5k3VTdX4+eQZl82gcaJMPU/V8Q0eNmPwFb3UU0uP7UJCLCFGPa48SIO9KDadfBhAzB9vLyXzY0OMPxp+PIWHfONCllioCNgFk0XDmZqTh6WZdAuVVilg9gE55LiIfmp6N6MPfCpxQCca4ivpncnGax4D7r+h5w+N2CDuA548c6jAyRsGCbfndhCNWhCnaujvq8pzLDDIoZwPIGUcPyp9/dH4RzxsfaHVef9Vr1rqVXKCBEQ3dncQFMKj1PdGufkgKH7AYBMx2M0RePwSxWz0RyJdcCz+6o1i4YGI1lE4L3pDPkPJgktsLVZkWutcp+Q31X1wQXZp04kXMF7PC38oVehMdBOL8+icE5uJvoAndk/Hzha42dDokQw3v7OnTdT7FYOH6LGO9cyoDdOhxV4oz01imCh7MoALW+9zsFw7TGueg+5ojrsjudcRnlPUDj7r3cKjd36eKMlinj0PF9YMSUqGi8xQL6WFdBmv/eWK2hF4FLf3IL2jr+JkX01ROLFv8naWSEbADHv+6VgihqBWZftfUPtwzhLSyUqPIDFYkUw6qR7/I9BhTlSc7/YMgwil9T/cIQrX7S5xo= X-MS-TrafficTypeDiagnostic: BYAPR05MB4855: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: InmUqWoyfnGr14DZgw/iGlwAymGEvSUoeiyZJI8OjfL35c8No3Xw1gr2emkc7xskXpZTJIjYNSSYa+Hh+MeG6x0hcbPP8jeihNAuvQgZTRWwVlIx5wkVybvp+QydL/svG6JNiKCO2dzn3cJ/9p8NfGPuJMmZW6TsacY/4izhP8oRWzOMeKEY9qkGhyfWsYhwPGoBwD1ajzKscTaefaSC4C/DiR9K/LgC2Q98U/21TqhB3aAkSyzWMBMpZ42XbXesYjMlgAqz/NILO3zajjECURVbJO1ePNjh9GNPVWtMs7C9HyGSICXZLjv4NsCYPGBro7bik3C1FJE8CrwPV++gUy/YDTS5mIIKQ7hjbpHwVY/Fw2p7rle0oFnGYC/xxrKLHrbCF7GGkLBpFsA6a4FM7sVm6mM6zL16GMxoOaX9Zlv7DtMy8z4I2C6BMjgK9Rfjq0T4FPS75Ba8Ad9JEVUYO58G/ocG18wsRXH6FN/5AtHjqUabY8jPIdAqtp8mjEY0WFaIeo//lAp29h94rEzS/woRKSF8TpaPm7TpWkka1k8= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: oNKjg59u1L8PgfCge4MmyVeWnHVz8PKhqoCsH9xQawI85xPfXG+if0Fpo511iP+u/P7YDzIcXqUGcL5nj81Qol3NokchxxakNTcibmNSSRf/eIcluVDmxQbXCjv4avwLGimUyV+1ic9m0iK4jCH+6A== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: cecfbf4f-c6c5-4eb4-1abe-08d99335cf08 X-MS-Exchange-CrossTenant-AuthSource: BYAPR05MB4023.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Oct 2021 19:22:37.0047 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR05MB4855 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Morgan Smith Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1634671396; 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=Wni8A3qDM2b0EN04sYAYhg9PS+qFHvJpy387YkDA6GM=; b=o1p4Lj2IkWJolldFzdn13zjKvtI5NJN30WRz1Fim3LBDJwDWOMG1b2am/YLIM9S41bkIeu iU9AwzeGM24w2t5raX4aBORTRjNdBqqKJkatUqCYwN11I0zqVCcCmmURDHO5OGD+ELCvz5 0mpIh+8ERgBYT1bwXuJbH4nswgka85p6vgXysDgkQAnqsmWtTUiXgTwjymEN0XdzHsImY7 zzfWPuQ9bWoZ/Wm+4t+wA39mCx6KYffSl+NZXCTSmLD9o1hUnulRsowkgTwp8yVl7RFNsi lgbKYExBRwlWdvqCTD9YeOig98UXJsx03ghsHYtE2Jdt7NnyZKpa1L0BlJxkFg== ARC-Seal: i=2; s=key1; d=yhetil.org; t=1634671396; a=rsa-sha256; cv=fail; b=BRW/OhJX1uavTBxkXZ501fotocXMNCAVltcnz5oqAB41UTGyISPgO5RjkmRqPlBCjz5lX4 tF1QbJfL163K7B+lhHBwGNSwMS8a7aHKdWn5vLcLr3YiqsXQyY0kAdf7RehSxNLa1EwauE HAFRk4wT2IpNmYTCMqRqK0wwjUQGafP4TwjZASv41YuHKRjN3TiAADeg9ejr51KGTbYBN9 Zmn4EQTkGGYBe8rRPm5CkRtVDG0VD7VAsQjRKFFxVOjx8kF9EwhF8pXfxC54/1Km0SFSU1 uzJvOfa/H7jC58kjhnMNJIwqD/PIW3NogQHet2XsEQ4kmmd6BlRBO9bK79WPXQ== ARC-Authentication-Results: i=2; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=outlook.com header.s=selector1 header.b=dWiOKXZj; arc=reject ("signature check failed: fail, {[1] = sig:microsoft.com:reject}"); spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Migadu-Spam-Score: 4.27 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=outlook.com header.s=selector1 header.b=dWiOKXZj; arc=reject ("signature check failed: fail, {[1] = sig:microsoft.com:reject}"); dmarc=fail reason="SPF not aligned (relaxed)" header.from=outlook.com (policy=none); spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Migadu-Queue-Id: BFFE32F671 X-Spam-Score: 4.27 X-Migadu-Scanner: scn1.migadu.com X-TUID: OPOKEVqKvbJj From: Morgan Smith * gnu/packages/emacs.scm (emacs) [restore-emacs-pdmp]: Change regex to handle filenames that have a fingerprint in them. Also remove #t at the end of the phase. --- I'm a fan of your idea. I tested this patch and it seems to work as expected. I do think that the fingerprint will never be a version and my original patch would've been fine. However, I'm not certain of that and there isn't a good reason to have a super precise regex here anyways. gnu/packages/emacs.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 6d9950d068..2aae21be6d 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -183,14 +183,13 @@ (define* (emacs-byte-compile-directory dir) (let* ((libexec (string-append (assoc-ref outputs "out") "/libexec")) ;; each of these find-files should return one file - (pdmp (find-files libexec "^emacs\\.pdmp$")) + (pdmp (find-files libexec "\\.pdmp$")) (pdmp-real (find-files libexec - "^\\.emacs\\.pdmp-real$"))) + "\\.pdmp-real$"))) (for-each (lambda (wrapper real) (delete-file wrapper) (rename-file real wrapper)) - pdmp pdmp-real)) - #t)) + pdmp pdmp-real)))) (add-after 'glib-or-gtk-wrap 'strip-double-wrap (lambda* (#:key outputs #:allow-other-keys) ;; Directly copy emacs-X.Y to emacs, so that it is not wrapped -- 2.33.1