From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id GEgJLbkObmGDLwEAgWs5BA (envelope-from ) for ; Tue, 19 Oct 2021 02:18:01 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id SG7GKLkObmH8BQAAB5/wlQ (envelope-from ) for ; Tue, 19 Oct 2021 00:18:01 +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 2975B2534 for ; Tue, 19 Oct 2021 02:18:01 +0200 (CEST) Received: from localhost ([::1]:45634 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mccWZ-0004Ml-4A for larch@yhetil.org; Mon, 18 Oct 2021 19:58:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42512) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mccW2-00040B-Ec for bug-guix@gnu.org; Mon, 18 Oct 2021 19:58:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:37327) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mccW2-0005mH-5O for bug-guix@gnu.org; Mon, 18 Oct 2021 19:58:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mccW2-0006JX-0T for bug-guix@gnu.org; Mon, 18 Oct 2021 19:58:02 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#51258: [PATCH] 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: Mon, 18 Oct 2021 23:58: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 Received: via spool by 51258-submit@debbugs.gnu.org id=B51258.163460142624209 (code B ref 51258); Mon, 18 Oct 2021 23:58:01 +0000 Received: (at 51258) by debbugs.gnu.org; 18 Oct 2021 23:57:06 +0000 Received: from localhost ([127.0.0.1]:48873 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mccV8-0006IP-D8 for submit@debbugs.gnu.org; Mon, 18 Oct 2021 19:57:06 -0400 Received: from mail-dm6nam10olkn2068.outbound.protection.outlook.com ([40.92.41.68]:65281 helo=NAM10-DM6-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mccV4-0006Hs-PV for 51258@debbugs.gnu.org; Mon, 18 Oct 2021 19:57:05 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UyMi6nPRhpnXHpEW6o/mKy3MpiWR+v26VbJ9p/M6MVOd7vqJJoM7Pp0GwyNr0ZZYlQEfVGd34oG4WbV+v6tPYhArOaRx10uaOMgB1LM+ddEMWn4bceqUFBlu63gHyEddBny3Gnt3HxebEdmNebnh4jq54FD2/Bh0kzxcyQ2zPPtQIhD+3DCdQZgywv5LpOKT7dWhdlUSXjHyxWtAdR6pBESeNcNkbExntkBZKRQNKWCTwjIJJjcsXC+e+aSqbymXbuSDKs2y+Vwej8N9aSWpeytYfuxg5Zx5O8XwPFbhDaVFhrAzktHkvanGOIDE18Yc77UbWU5zrfeJH/gZL0Aehw== 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=PyM+hxvVYURDmOFyuGu598UQ5WXqmZ4634cg607Fl1Q=; b=iiHngxIVMO/vkzDGlboR/ZE6Dgr4yuBqX/7pUuZDe5Qfht55HPtblxb9ucP66IcA3cG+rzC5wWFxK4y9KsrlOogILcyksIZjgUMaY93hoNW08ZX/J4nrvMVFGZdsfwLyxNeMqSEd2L7WgaJBfTbR8kd/hhrdkOuQQ4BCxryvYiWixEnixo05SpY/Mdei85qiIft2Xu+6livbMe9g+eN8LRNsKDBiDfykayZabzpWPrsWXWNfcWQoZ7POPBhvB0vruYTJlkdoK+RwFE1g6+WZb3Kt4bA0lhX5ByDku9h2hi7CxvHn0zYsv1uFwu2HNVMQfPqVJi8RevYnid5R++fhbw== 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=PyM+hxvVYURDmOFyuGu598UQ5WXqmZ4634cg607Fl1Q=; b=WS7ZbtuffC7X3X/VN+M7jvGqrBdweNsRACLisEaras3rM1KE429Oxp24oSoAu27H0ZYVi0o57+xXg8jPtTp0fqbMw9zlDa1eqtAlc4+bH8IQj3TQK6RawEW17MNSoWCj8zCGWvuIQxi95WsOJkmz01V5HbMgXBOWRnF73xbHwuZsfinADEv2VB/HCcv8KtpYeCyvCaUzHa11rlrEfwoTLAyXxJC3IY0AAsNCwi9uGBpqa5GZxRH8z+yv2/oCCjO0QrX9aVTMOkOSp+f56PNlHKfxp4ppXivIFfKc47d0hiUQi21TOdCtN0mSncm1tyh1yIvFUZMo1OKAK7ecpwGkxg== Received: from BYAPR05MB4023.namprd05.prod.outlook.com (2603:10b6:a02:87::30) by BYAPR05MB5605.namprd05.prod.outlook.com (2603:10b6:a03:19::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.13; Mon, 18 Oct 2021 23:56:55 +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.013; Mon, 18 Oct 2021 23:56:55 +0000 From: Morgan.J.Smith@outlook.com Date: Mon, 18 Oct 2021 19:50:21 -0400 Message-ID: X-Mailer: git-send-email 2.33.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-TMN: [dzNiotnBAhvxODMHktpf3j0eI5hh0V0B] X-ClientProxiedBy: YQBPR0101CA0074.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:4::7) To BYAPR05MB4023.namprd05.prod.outlook.com (2603:10b6:a02:87::30) X-Microsoft-Original-Message-ID: <20211018235020.2571-1-Morgan.J.Smith@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from workpad.hitronhub.home (170.52.80.188) by YQBPR0101CA0074.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:4::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.18 via Frontend Transport; Mon, 18 Oct 2021 23:56:53 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 698057ab-1c8e-4189-2afa-08d99292f64d X-MS-Exchange-SLBlob-MailProps: qY7UPrLqMbalyWoI5u7OsJQuz3l+pwQCYLwsTLkCrLcOq1YbkD/tboYf8KFfL40bpNq9jObRKO6+wLDdEnGYl1xAqrWDzkd+kVQ5jbV5r3HTokWxB+rsPsNzIk26KMvoEgHGzeOwL5FkrFKGF2o5HlADLDOp+98hye+YOPUzuNx/BUQCv0YxW3v8ZryooMOr3uezzY5t45y7ue6QOuu1oJDlI1FBc+rPaU4MpXOtYzv3z8qAJ/EdqHhTDq44Pm+hjkGsBzvZnOA1t15ef1ZfKVVXHpU9gBmTraxfkoJcEAbbfdEPl+RANJmP5gcGkv6wNAQRE213B351SyQpNEC7V+9UPSQplVR8Vxj1ze+IYCPPZiwQUen1+B9yONU1Ip2cAcQQGrFnD3o4fDAXLbp3Qe8EduA7/M4sN3SVfTDCV6hK599aOohw9p7eXf6ckUk+P2LzWXQl/meaXBc+e13nJ5qQhKfrzIr0oCLOP4dX3hmCYWfTGKWER3yi+olOaXxlJ6ZOzh6Qo3CE5j10QpIf56/3tsyZ2Io9KJkEOl3MCia8eJUDquC3dpWhAyWcqY+L1chU0CAMbZVEVrsPIi0oEaI/sQIKKTnCiB/QrVt7elV1joovWkW+vxwR2ES/7B6SQGmRuQWe+5HpCEe2hURumeIw2aeQ5x/6fkxpgjDbtkGZT5W94rYe4zAWDdZfwT77+mGEHk0uuX0YEmzS4zInow== X-MS-TrafficTypeDiagnostic: BYAPR05MB5605: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vPwRZbRPDN5qiDdjxy8nFV8M0xMYmeuR5bbI3RkDIEc5vy5ptPwpG5RGGqxZvkEt5lvssy41sxCOgTbc9lRkqwqeLvhPufUYlutOxx/MNGP+/vbFVa5aEpvVXeJVZovho+ehfrgCdCzL/CCmftHbzVxDITxdBN5kFwhPwmiTQbSIKzX0kgcPmJ1mi0xq4IY6zTKDJa4FZfL1wVPTJV2cTIKhiqGXNgUt2QWQdtcqVgEyysd4uBUbdV3PjjskRfcU5kiVHegg0se/O0s2QG56xikPBBw2Obyk0GDQBHpY61OtVmJ/NsPaMMV1etqUc3ooevKFiW0i3ipHUTs4anok0ga0Gn3iB/JhVZzRewOHhg4Zv2267hr4v7kJzyelhQfRTeWF6cby/o87fZz74d+8szcjcc2mP6Ugxlf213VyQ+WP7O2IpXcWVfqtN2Mu3VYkNndgWhtepEnw6WGBIedykVtdfwaUaHK96dvIg7x78izWRlYZv5MMA1SeRQQVoex0aDI0c0CyIJLeH+fZUIdS7gnMk+jbysiAoZMI1FIAojw= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: AiVPMyLFNNXf24RzrBXysVCzap4XyHFFW+BWCp5U1g90HiwMfacJ9XyAjdAEf9+Ww7PXAI26l2uot14odjGhPuql9f+tOeTqr8VBvaSj0mXd5EoZNtWiVA/Z/jVZZPv9jaS65pVYCn8scQWAYIkUWw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 698057ab-1c8e-4189-2afa-08d99292f64d X-MS-Exchange-CrossTenant-AuthSource: BYAPR05MB4023.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Oct 2021 23:56:55.2933 (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: BYAPR05MB5605 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=1634602681; 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=PyM+hxvVYURDmOFyuGu598UQ5WXqmZ4634cg607Fl1Q=; b=bVykQ/fA42QS5HziWuj5XAsqkmfAF6hHj8lwRP8yBdW13UmPwm8AZwDDlPCf0S4BraztbY /zGigfyVZ/KvyHloxLDMS7jiLvK7BTGjrACtulNrZb9QGHCJVJ9IvfR11dbrtI7zTV4FY9 zBzjZzl+FuN8wd2SEzNaN91EVRjdcwuNL8TLtS/LiCng0Q4nvI2adL+TpLQj3b7qm/F5Xf 6zRuIGrp0UHJ++bC6G+ChJkBsNDnEyFxV41LAdxPrN4cVSVzYfb/WYHk51bjpfjCK3xH0p KsKjSEKziSN/PRBGrjBezrEjCPJe0+Mxeq3VDmo0bBrGYo/LFm7iz9bhB3Fwrg== ARC-Seal: i=2; s=key1; d=yhetil.org; t=1634602681; a=rsa-sha256; cv=fail; b=DujV4JuYO8XDtVYbSb0reoDNcLTE7lR2+mtO8EK+vxEb+NbcFVZtDJyqNmfLlXP9jwWBSr Fx4iPy0L7h1RM903anzR7E0o86Q3H8vGJuzccOpAr8mWxJeS7jRGNzdtwSAOmLrUgwhJoe IQyF8sXgnUJLj8E1b1lSfpyccqvIWwQZCIDdkk8XBr/5h9SG0vDFq7AMUYrT3aSQER9MK9 cVf0OkrsXI7U+hhjVHsXvvt3mTG0+oZmPWXKhORJGQBaPnnyVTOT+eFWDE6q29QZv5heDL vsv5jRp5W29VEYEDaUM+NwLWgPO4uVv9paK4R0gHLoJCRleeZE+vZtzLN6hniA== ARC-Authentication-Results: i=2; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=outlook.com header.s=selector1 header.b=WS7Zbtuf; 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-Spam-Score: 4.67 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=outlook.com header.s=selector1 header.b=WS7Zbtuf; 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: 2975B2534 X-Spam-Score: 4.67 X-Migadu-Scanner: scn0.migadu.com X-TUID: DdkBoj0NHm1/ From: Morgan Smith * gnu/packages/emacs.scm (emacs) [restore-emacs-pdmp]: Add regex to handle filenames that have a fingerprint in them --- Fixed your problem. Well it was also my problem. The regex is pretty simple but probably a little intimidating if you've never done it before. I highly recommend reading up on ERE's and BRE's from the POSIX specification if you have time. I still don't exactly know how guile does regex but knowing POSIX regex has served me quite well. I've tested this patch and it works great for me on the latest emacs commit. It should also be backwards compatible so that's nice. gnu/packages/emacs.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 6d9950d068..6ebcfecbc7 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -183,9 +183,10 @@ (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$")) + ;; there might be a fingerprint in the name + (pdmp (find-files libexec "^emacs(-[[:xdigit:]]+)?\\.pdmp$")) (pdmp-real (find-files libexec - "^\\.emacs\\.pdmp-real$"))) + "^\\.emacs(-[[:xdigit:]]+)?\\.pdmp-real$"))) (for-each (lambda (wrapper real) (delete-file wrapper) (rename-file real wrapper)) -- 2.33.0