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#59684: 29.0.50; [PATCH] package.el: Insert news for installed packages only Date: Tue, 29 Nov 2022 21:06:33 +0000 Message-ID: <87mt89bhd2.fsf@posteo.net> References: Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="14604"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 59684@debbugs.gnu.org To: Andrii Kolomoiets Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Nov 29 22:07:40 2022 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 1p07pK-0003Xf-LG for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 29 Nov 2022 22:07:38 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p07oy-0001w6-Oa; Tue, 29 Nov 2022 16:07:16 -0500 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 1p07ol-0001vF-HG for bug-gnu-emacs@gnu.org; Tue, 29 Nov 2022 16:07:11 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p07ok-0004T3-MY for bug-gnu-emacs@gnu.org; Tue, 29 Nov 2022 16:07:03 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p07ok-0000ke-5B for bug-gnu-emacs@gnu.org; Tue, 29 Nov 2022 16:07:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Philip Kaludercic Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 29 Nov 2022 21:07:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59684 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-Cc: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.16697560062882 (code B ref -1); Tue, 29 Nov 2022 21:07:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 29 Nov 2022 21:06:46 +0000 Original-Received: from localhost ([127.0.0.1]:56339 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p07oT-0000kQ-TF for submit@debbugs.gnu.org; Tue, 29 Nov 2022 16:06:46 -0500 Original-Received: from lists.gnu.org ([209.51.188.17]:60276) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p07oP-0000kK-NT for submit@debbugs.gnu.org; Tue, 29 Nov 2022 16:06:44 -0500 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 1p07oL-0001rl-PW for bug-gnu-emacs@gnu.org; Tue, 29 Nov 2022 16:06:41 -0500 Original-Received: from mout02.posteo.de ([185.67.36.66]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p07oI-0004MM-KU for bug-gnu-emacs@gnu.org; Tue, 29 Nov 2022 16:06:37 -0500 Original-Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id E2038240103 for ; Tue, 29 Nov 2022 22:06:31 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1669755991; bh=xzu5gvqvy6lwBWqDItjAmKfg0i+l6hY1q495DrnHqss=; h=From:To:Cc:Subject:Date:From; b=Os9P3wsWOr5TYjLpDgSn58dMfJujQNzkh8cjKiFj2Sk0ornVLrdaQ17b0LaiG6U2Y eXxu/AWUBsdIeiRAptO8JdFtn21Q0bLHHDJFOlFuOsYaeCoztM4cdeTapIax4cMtqe /hN9r4XKxVrpAnBmtZg326U6RwFJ7q9eWJRj8mdd4H5+/T8rFmQtti//P1O4Tn3Xdz +935NL4XcHwaxO3WiPAAsWsJa99dQL4ZmML9GvALzhEGwTadN5pBlnYHxSiehyGKqx x1WAmprxderad7sgwPvcQvKvnZm02ReKjasByYT0e+cJKv1JwLaq39xik1uuFvYv43 8EEDQUC0dRfEA== Original-Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4NMFJ70tntz6tmH; Tue, 29 Nov 2022 22:06:30 +0100 (CET) In-Reply-To: (Andrii Kolomoiets's message of "Tue, 29 Nov 2022 18:54:44 +0200") Received-SPF: pass client-ip=185.67.36.66; envelope-from=philipk@posteo.net; helo=mout02.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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:249443 Archived-At: Andrii Kolomoiets writes: > Hi, > > In some folder, e.g. "/tmp": > 1. Create folder named "news" > 2. emacs -Q > 3. M-x list-packages > 4. RET on any available not installed package > > This will produce "Read error: Is a directory, /tmp/news" message. > > In GNU Emacs 29.0.50 > Repository revision: 2772ebe3667f28cefd0d6134204ce6a3c7a8c323 > Repository branch: master > > Adding news to package description was introuced in > dd98fedd0c7f27bfba046d761042c19181cb461d > > Adding Philip to Cc as the author of the original commit. > > Attached patch solves issue by checking that: > 1. pkg-dir is not nil > 2. pkg-dir is not 'builtin > 3. "news" is a regular file This sounds good. > From 9bd185609643ec861b02b4327295bb6db3b82974 Mon Sep 17 00:00:00 2001 > From: muffinmad > Date: Mon, 28 Nov 2022 23:09:59 +0200 > Subject: [PATCH] Insert news for installed packages only > > * lisp/emacs-lisp/package.el (describe-package-1): Check package is > installed and "news" is a regular file. > --- > lisp/emacs-lisp/package.el | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el > index 8d44fae30a0..f722eb8fae9 100644 > --- a/lisp/emacs-lisp/package.el > +++ b/lisp/emacs-lisp/package.el > @@ -2696,8 +2696,10 @@ describe-package-1 > (signed (if desc (package-desc-signed desc))) > (maintainer (cdr (assoc :maintainer extras))) > (authors (cdr (assoc :authors extras))) > - (news (and-let* ((file (expand-file-name "news" pkg-dir)) > - ((file-readable-p file))) > + (news (and-let* (pkg-dir > + ((not built-in)) > + (file (expand-file-name "news" pkg-dir)) > + ((file-regular-p file))) Shouldn't we keep `file-readable-p'? > file))) > (when (string= status "avail-obso") > (setq status "available obsolete"))