From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Philip Kaludercic Newsgroups: gmane.emacs.bugs Subject: bug#64985: 29.1; [PATCH] Byte-compilation of packages via package-vc doesn't correctly handle .elpaignore wildcards Date: Tue, 01 Aug 2023 19:21:42 +0000 Message-ID: <873512k1q1.fsf@posteo.net> References: <8e555eb8-529d-d11c-66c7-bd16f5d45be7@gmail.com> <931A378C-454C-442C-9551-9A0905F1CBFC@gmail.com> <87a5vak40n.fsf@posteo.net> <9ec021b5-40ca-6858-b2d3-d2bb975d3602@gmail.com> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="6381"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 64985@debbugs.gnu.org, Mattias =?UTF-8?Q?Engdeg=C3=A5rd?= To: Jim Porter Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Aug 01 21:22:10 2023 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qQuwc-0001Ss-9O for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 01 Aug 2023 21:22:10 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qQuwW-0007XP-WE; Tue, 01 Aug 2023 15:22:05 -0400 Original-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 1qQuwU-0007Vp-Qp for bug-gnu-emacs@gnu.org; Tue, 01 Aug 2023 15:22:02 -0400 Original-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 1qQuwU-0005PZ-Hi for bug-gnu-emacs@gnu.org; Tue, 01 Aug 2023 15:22:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qQuwU-0007vn-Cv for bug-gnu-emacs@gnu.org; Tue, 01 Aug 2023 15:22:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Philip Kaludercic Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 01 Aug 2023 19:22:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64985 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 64985-submit@debbugs.gnu.org id=B64985.169091771230470 (code B ref 64985); Tue, 01 Aug 2023 19:22:02 +0000 Original-Received: (at 64985) by debbugs.gnu.org; 1 Aug 2023 19:21:52 +0000 Original-Received: from localhost ([127.0.0.1]:48332 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qQuwJ-0007vO-NO for submit@debbugs.gnu.org; Tue, 01 Aug 2023 15:21:52 -0400 Original-Received: from mout02.posteo.de ([185.67.36.66]:51069) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qQuwH-0007vA-La for 64985@debbugs.gnu.org; Tue, 01 Aug 2023 15:21:50 -0400 Original-Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id A1570240103 for <64985@debbugs.gnu.org>; Tue, 1 Aug 2023 21:21:43 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1690917703; bh=XwermXkROiziCzJzr43KijREkzIBqrIymFR8QZI82nw=; h=From:To:Cc:Subject:Autocrypt:Date:Message-ID:MIME-Version:From; b=EHpshXqZWic1srDIcb0ZuLO/CCyl3VLdyzuGC7QwozqB4v41gsarZDNxJOMzROkjG eK/pGU7QWBdhGxUf6owdzJeHeUJbTaCjZxLRzLTYzKEmRqQDW97Z7opPa3LkdfQWFv ck9li23mSVsO8pLaHIfoDRBL5XOl1QDMzh26zHfhmclzz0Z1Vbf5Lo2q6o4PrP8h/b jIeqzS2Egfds5ddUrF8bk/ac98jV7qIE5VlyMbaxSQleEZehEfGwX5tert50c/nQlG Mg2ANlEDA76q92cmR4RxyH5wWDozHyiYuPgkpEqSHoM+hOnaCn7mJnutJzBe9ofz4A xDeMvUxALoepg== Original-Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4RFlN66kRNz6v89; Tue, 1 Aug 2023 21:21:42 +0200 (CEST) In-Reply-To: <9ec021b5-40ca-6858-b2d3-d2bb975d3602@gmail.com> (Jim Porter's message of "Tue, 1 Aug 2023 12:18:50 -0700") Autocrypt: addr=philipk@posteo.net; keydata= mDMEZBBQQhYJKwYBBAHaRw8BAQdAHJuofBrfqFh12uQu0Yi7mrl525F28eTmwUDflFNmdui0QlBo aWxpcCBLYWx1ZGVyY2ljIChnZW5lcmF0ZWQgYnkgYXV0b2NyeXB0LmVsKSA8cGhpbGlwa0Bwb3N0 ZW8ubmV0PoiWBBMWCAA+FiEEDg7HY17ghYlni8XN8xYDWXahwukFAmQQUEICGwMFCQHhM4AFCwkI BwIGFQoJCAsCBBYCAwECHgECF4AACgkQ8xYDWXahwulikAEA77hloUiSrXgFkUVJhlKBpLCHUjA0 mWZ9j9w5d08+jVwBAK6c4iGP7j+/PhbkxaEKa4V3MzIl7zJkcNNjHCXmvFcEuDgEZBBQQhIKKwYB BAGXVQEFAQEHQI5NLiLRjZy3OfSt1dhCmFyn+fN/QKELUYQetiaoe+MMAwEIB4h+BBgWCAAmFiEE Dg7HY17ghYlni8XN8xYDWXahwukFAmQQUEICGwwFCQHhM4AACgkQ8xYDWXahwukm+wEA8cml4JpK NeAu65rg+auKrPOP6TP/4YWRCTIvuYDm0joBALw98AMz7/qMHvSCeU/hw9PL6u6R2EScxtpKnWof z4oM X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:266475 Archived-At: Jim Porter writes: > On 8/1/2023 11:32 AM, Philip Kaludercic wrote: >> In that case we should certainly apply a patch along the lines of what >> you suggested, but I would prefer the mapconcat approach, if anything >> because of the micro-optimisation of avoiding the overhead for the >> generic seq call and having the create and apply closure over and over >> again. Not sure if this counts as a strong preference, but it certainly >> is a preference. > > How about this? For extra micro-optimization, I put the 'mapconcat' > call outside of the loop. Now we won't concat the same list of strings > for every file/dir that we look at. I like this a lot more, thanks. > From b530de0f6393dbb516ec0e5601ca9c26dbbce710 Mon Sep 17 00:00:00 2001 > From: Jim Porter > Date: Mon, 31 Jul 2023 23:10:03 -0700 > Subject: [PATCH] Fix handling of ".elpaignore" file when compiling packages > > * lisp/emacs-lisp/bytecomp.el (byte-recompile-directory): Treat > 'byte-compile-ignore-files' as a list of regexps per its docstring > (bug#64985). > --- > lisp/emacs-lisp/bytecomp.el | 10 ++++------ > 1 file changed, 4 insertions(+), 6 deletions(-) > > diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el > index 5b1d958e6c2..f0656628236 100644 > --- a/lisp/emacs-lisp/bytecomp.el > +++ b/lisp/emacs-lisp/bytecomp.el > @@ -1975,6 +1975,8 @@ byte-recompile-directory > (emacs-lisp-compilation-mode)) > (let ((directories (list default-directory)) > (default-directory default-directory) > + (ignore-files-regexp > + (mapconcat #'identity byte-compile-ignore-files "\\|")) > (skip-count 0) > (fail-count 0) > (file-count 0) > @@ -1995,9 +1997,7 @@ byte-recompile-directory > (or (null arg) (eq 0 arg) > (y-or-n-p (concat "Check " source "? "))) > ;; Directory is requested to be ignored > - (not (string-match-p > - (regexp-opt byte-compile-ignore-files) > - source)) > + (not (string-match-p ignore-files-regexp source)) > (setq directories (nconc directories (list source)))) > ;; It is an ordinary file. Decide whether to compile it. > (if (and (string-match emacs-lisp-file-regexp source) > @@ -2007,9 +2007,7 @@ byte-recompile-directory > (not (auto-save-file-name-p source)) > (not (member source (dir-locals--all-files directory))) > ;; File is requested to be ignored > - (not (string-match-p > - (regexp-opt byte-compile-ignore-files) > - source))) > + (not (string-match-p ignore-files-regexp source))) > (progn (cl-incf > (pcase (byte-recompile-file source force arg) > ('no-byte-compile skip-count)