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 OMGnDnMib2GyywAAgWs5BA (envelope-from ) for ; Tue, 19 Oct 2021 21:54:27 +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 wHRSCnMib2G9KAAAB5/wlQ (envelope-from ) for ; Tue, 19 Oct 2021 19:54:27 +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 C78512F209 for ; Tue, 19 Oct 2021 21:54:26 +0200 (CEST) Received: from localhost ([::1]:37182 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mcvBo-0005Il-To for larch@yhetil.org; Tue, 19 Oct 2021 15:54:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60814) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mcvBS-0005Ia-TS for bug-guix@gnu.org; Tue, 19 Oct 2021 15:54:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40504) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mcvBS-0002EL-KR for bug-guix@gnu.org; Tue, 19 Oct 2021 15:54:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mcvBS-0006pU-Ci for bug-guix@gnu.org; Tue, 19 Oct 2021 15:54:02 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#51258: [PATCH v2] gnu: emacs: Handle pdump filenames that contain a fingerprint Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Tue, 19 Oct 2021 19:54:02 +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: Morgan.J.Smith@outlook.com, 51258@debbugs.gnu.org, paxton@riseup.net Received: via spool by 51258-submit@debbugs.gnu.org id=B51258.163467319226196 (code B ref 51258); Tue, 19 Oct 2021 19:54:02 +0000 Received: (at 51258) by debbugs.gnu.org; 19 Oct 2021 19:53:12 +0000 Received: from localhost ([127.0.0.1]:52050 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mcvAd-0006oS-W6 for submit@debbugs.gnu.org; Tue, 19 Oct 2021 15:53:12 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:50981) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mcvAc-0006oG-BY for 51258@debbugs.gnu.org; Tue, 19 Oct 2021 15:53:10 -0400 Received: by mail-wm1-f65.google.com with SMTP id o24so6646782wms.0 for <51258@debbugs.gnu.org>; Tue, 19 Oct 2021 12:53:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:subject:from:to:date:in-reply-to:references:user-agent :mime-version:content-transfer-encoding; bh=eethx63+kQMVFsAsKjurtUyBKd0PPuOsWIpWsDX5nTg=; b=P1p1C1MdKl6lMjeBaylFqrLmMfiMaTpQRwwgFbYivwbpDNcL0C0wObNW2V6P5SrPNB 81yh1rsClAle/PHDN9fInxNJueSSpKPUoCm2XktwZprWPAJxqs+6yKVHUZVg7A9ry2fs BBJZNOyj3kzjGDnwF+w+twn3YDxap2DtS9dUMOUyd0pJsbwSjR0r3Kr0HJXaUcjOZwVt S94NrKRZJ6iiNjoC8tkc/2TQItiwel+Y2t2CE7XWsAAV7pk26XYYOHSDvc9mji7eAxT1 KRlkrbq0kegkS97Z4NO0FKwdcut/g5TpmLde0L43ymN2wKyij78zpE0WT0oDg9dH1cu+ MT6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:subject:from:to:date:in-reply-to :references:user-agent:mime-version:content-transfer-encoding; bh=eethx63+kQMVFsAsKjurtUyBKd0PPuOsWIpWsDX5nTg=; b=kvZ4dvZupQuAFryuPd2z07DowEdQjDtaoZWoolvSbA0sMCsuTGIme+chQVHiPZm3fR wW7thtv8A21aaWZyFSIol0OAVlbSSQMfnOueDGKxMWXGeGXiq3bQpHFlDc+j8N3Uxa/O XojRdBlqbPrJJP9aOKQ6HlkBmgyyrzr1ClFPt963zMjFHxUvbdhxsEqjW1Ui72ZxoGfu T7D+GRNWUOKpY4li9JYp082M11u10365I8f48yzVeMXzL4C9sS1d6MKaYUE7GoU2dz90 Hc2vFfzYUpUMvsXUlCmIzqG99CbOr9Yxa2dL3ib09Wi5fvqS6r7DQew0o5SOCbnJQFg9 oNEQ== X-Gm-Message-State: AOAM53133MlwnWjTOAciEAgxdwyHWBiJhkuEX8gDFDqxLBvRYqcpgBun dU08GtlhSoAQBPtg416v7Wg= X-Google-Smtp-Source: ABdhPJx3VkZ1w/6fdjpMs/0CN61zkYIfjPS3tp9obx2ihU46VnRSzsjvZF1lL3mrf2KKWx5mimYoYA== X-Received: by 2002:adf:a183:: with SMTP id u3mr46181962wru.330.1634673184401; Tue, 19 Oct 2021 12:53:04 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id p12sm13574121wrr.67.2021.10.19.12.53.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Oct 2021 12:53:04 -0700 (PDT) Message-ID: From: Liliana Marie Prikler Date: Tue, 19 Oct 2021 21:53:02 +0200 In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1634673266; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to: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=eethx63+kQMVFsAsKjurtUyBKd0PPuOsWIpWsDX5nTg=; b=lxmy9rjirGgGdy2MfqjtbkHTZFZiBbM4OSLaekurxzHvdVRnx1xlnOI2tufSu83R9s2lTd S7utNzsBCmifSMZuQF7U8WgohNlM5lj9gpSQfD0uyIheEOg1giAZ5tLCCdVY4k8XFMRYyS 9/uTiMecM6bVUWVf7dqLW6xkbRPnX+4z1IVN4qj1shxRZUHvUXf7MKN6Cen+XmnQevd1Ye NF8b16coEixtFWZ9yOh+DKbJuOHNw9LIjIwE8tHWLBNEq+cfStbBFli0TovVDNTEZaeBL7 al96/eTlUUFdJGFJYuycZF4oTGHjac2Pd2km+MgMyBiS0lCcbNOLKuA1ChMpQw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1634673266; a=rsa-sha256; cv=none; b=sszdIacS9TF9wqQz87nQ8+OJPIQjRvVzZWmNpSykTd6RdBYwNPEnXMls+m8IKPrqVK80UM I4kyzfpVtFblgb7zU8rP9FBtkghzy+oBpT/eQLTgXcaNxrU4hmGNntrYBvEokBqsjLamzl hby10SWcrInOLVt+EtHugEb2XxfE+VLJh4+n70FpJtTXkRznthADW608mAS+aRaNGnR9w6 /sHq7aHHsbd7OhH3T0a2dEMxRvpRKlYCwNSYUZMHOgazQS4OI0Pwjvg0/d+usymLN2m9Ae b3KGPvTaw2CM3H2p5rVW3Z6EV1IrjmOK41Bi4Fr4gAaxKQjpi3lr2JE8Zx9Dcg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=P1p1C1Md; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.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: -1.73 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=P1p1C1Md; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.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: C78512F209 X-Spam-Score: -1.73 X-Migadu-Scanner: scn1.migadu.com X-TUID: USZMyoDikyTz Am Dienstag, den 19.10.2021, 15:10 -0400 schrieb Morgan.J.Smith@outlook.com: > 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. Mostly LGTM, but keep in mind that your new pdmp and pdmp-real could potentially match more than one file even if realistically there's only one to be matched. Hence why I've said we ought to construct the old file name from the pdmp-real, because find-files need not be sorted. > > 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 Regards, Liliana