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#64543: [PATCH] package-report-bug: don't fail on custom groups defined by eval Date: Fri, 14 Jul 2023 19:44:15 +0000 Message-ID: <87fs5qp9bk.fsf@posteo.net> References: <87351xm2ri.fsf@catern.com> <87edlfkg70.fsf@posteo.net> <87ttu9j5ii.fsf@catern.com> <87edlcc3ms.fsf@posteo.net> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="3582"; mail-complaints-to="usenet@ciao.gmane.io" Cc: sbaugh@catern.com, 'Eli Zaretskii' , 64543@debbugs.gnu.org To: Spencer Baugh Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Fri Jul 14 21:45:16 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 1qKOj4-0000fV-W3 for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 14 Jul 2023 21:45:15 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qKOit-0000KL-8p; Fri, 14 Jul 2023 15:45:03 -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 1qKOis-0000J6-3U for bug-gnu-emacs@gnu.org; Fri, 14 Jul 2023 15:45: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 1qKOir-0006UN-RD for bug-gnu-emacs@gnu.org; Fri, 14 Jul 2023 15:45:01 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qKOir-0003Gn-NY for bug-gnu-emacs@gnu.org; Fri, 14 Jul 2023 15:45:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Philip Kaludercic Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 14 Jul 2023 19:45:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64543 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 64543-submit@debbugs.gnu.org id=B64543.168936387012520 (code B ref 64543); Fri, 14 Jul 2023 19:45:01 +0000 Original-Received: (at 64543) by debbugs.gnu.org; 14 Jul 2023 19:44:30 +0000 Original-Received: from localhost ([127.0.0.1]:43552 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qKOiM-0003Fs-7x for submit@debbugs.gnu.org; Fri, 14 Jul 2023 15:44:30 -0400 Original-Received: from mout01.posteo.de ([185.67.36.65]:56621) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qKOiK-0003Ff-9N for 64543@debbugs.gnu.org; Fri, 14 Jul 2023 15:44:28 -0400 Original-Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id B801A240027 for <64543@debbugs.gnu.org>; Fri, 14 Jul 2023 21:44:22 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1689363862; bh=ax+OHev3xv6TE9vuTk2jHOFzGHMP2j0H5NE8unjBCr8=; h=From:To:Cc:Subject:Autocrypt:Date:Message-ID:MIME-Version:From; b=VhRqBUE8io0F0fhx1saLwNaZh5PJ+UtKz9erwGOuBQhSI5ABIgfApZFsUporZWSnu nWDWg5q16dyiGlPOI/9W1PvWYwrC96khC7RwzkOfwFlE+luhSR4R2/pC0zju6X2qUC hhERloyi9XJFAIwa5xS2j2o5JcYovS0FxENRCM2bGBs6H9lL7wXH3Wk1qDAyD8ll77 TlLYCOrCGF/uH598k0LJp2x+o+t21jH0rWdDpVQn6opPKdog/7IPQbVyKDx3aHKMoc iL6IyKIz9AnRI8+0bCRghv22wO9br0pqImmeIyyegTE4JIfdsGzPaD4yTg9f99yV2z y3DCECKn5FPxA== Original-Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4R2hkS1Swzz6twK; Fri, 14 Jul 2023 21:44:16 +0200 (CEST) In-Reply-To: (Spencer Baugh's message of "Wed, 12 Jul 2023 15:56:44 -0400") 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:265125 Archived-At: Spencer Baugh writes: > Philip Kaludercic writes: > >> sbaugh@catern.com writes: >>> Good point. I was just copying the last condition in the and. Lifted >>> them both out of the loop: >>> >>> From 2873d4c482acfd1ced749d593fd512c408e0a578 Mon Sep 17 00:00:00 2001 >>> From: Spencer Baugh >>> Date: Sun, 9 Jul 2023 22:21:03 -0400 >>> Subject: [PATCH] Support transforming the dirname used by uniquify >> >> Wrong patch? > Oops! Here's the right one: > > From fb31777bcc1935de351eaa35c1ed679c66d24a92 Mon Sep 17 00:00:00 2001 > From: Spencer Baugh > Date: Sun, 9 Jul 2023 12:59:50 -0400 > Subject: [PATCH] package-report-bug: don't fail on custom groups defined by > eval > > Previously we just assumed that the car of an element of > custom-current-group-alist was a filename. But actually it can be nil > if a custom group was defined by just evaling Lisp. > > * lisp/emacs-lisp/package.el (package-report-bug): Don't fail when a > custom group was defined by eval. > --- > lisp/emacs-lisp/package.el | 15 ++++++++------- > 1 file changed, 8 insertions(+), 7 deletions(-) > > diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el > index 3e6acd9b388..58ca19f7fe2 100644 > --- a/lisp/emacs-lisp/package.el > +++ b/lisp/emacs-lisp/package.el > @@ -4637,13 +4637,14 @@ package-report-bug > vars) > (dolist-with-progress-reporter (group custom-current-group-alist) > "Scanning for modified user options..." > - (dolist (ent (get (cdr group) 'custom-group)) > - (when (and (custom-variable-p (car ent)) > - (boundp (car ent)) > - (not (eq (custom--standard-value (car ent)) > - (default-toplevel-value (car ent)))) > - (file-in-directory-p (car group) (package-desc-dir desc))) > - (push (car ent) vars)))) > + (when (and (car group) > + (file-in-directory-p (car group) (package-desc-dir desc))) > + (dolist (ent (get (cdr group) 'custom-group)) > + (when (and (custom-variable-p (car ent)) > + (boundp (car ent)) > + (not (eq (custom--standard-value (car ent)) > + (default-toplevel-value (car ent))))) > + (push (car ent) vars))))) > (dlet ((reporter-prompt-for-summary-p t)) > (reporter-submit-bug-report maint name vars)))) LGTM. Eli, would it be OK to push this to emacs-29, as this is a bug in the existing code? Most of the changes are indentation/whitespace changes anyway.