From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Andrii Kolomoiets Newsgroups: gmane.emacs.bugs Subject: bug#59684: 29.0.50; [PATCH] package.el: Insert news for installed packages only Date: Tue, 29 Nov 2022 23:38:24 +0200 Message-ID: References: <87mt89bhd2.fsf@posteo.net> <87edtlbghf.fsf@posteo.net> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="24640"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: 59684@debbugs.gnu.org To: Philip Kaludercic Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Nov 29 22:39:27 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 1p08K6-00065x-I8 for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 29 Nov 2022 22:39:26 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p08Jo-0004rQ-7t; Tue, 29 Nov 2022 16:39:08 -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 1p08Ji-0004q1-Us for bug-gnu-emacs@gnu.org; Tue, 29 Nov 2022 16:39:02 -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 1p08Ji-0002wx-KO for bug-gnu-emacs@gnu.org; Tue, 29 Nov 2022 16:39:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p08Ji-00019M-G4 for bug-gnu-emacs@gnu.org; Tue, 29 Nov 2022 16:39:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Andrii Kolomoiets Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 29 Nov 2022 21:39: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 Original-Received: via spool by 59684-submit@debbugs.gnu.org id=B59684.16697579154407 (code B ref 59684); Tue, 29 Nov 2022 21:39:02 +0000 Original-Received: (at 59684) by debbugs.gnu.org; 29 Nov 2022 21:38:35 +0000 Original-Received: from localhost ([127.0.0.1]:56565 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p08JH-000191-Hu for submit@debbugs.gnu.org; Tue, 29 Nov 2022 16:38:35 -0500 Original-Received: from mail-qk1-f180.google.com ([209.85.222.180]:39805) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p08JF-00018v-9v for 59684@debbugs.gnu.org; Tue, 29 Nov 2022 16:38:34 -0500 Original-Received: by mail-qk1-f180.google.com with SMTP id g10so10898323qkl.6 for <59684@debbugs.gnu.org>; Tue, 29 Nov 2022 13:38:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=4jyR/PHSHUcFWjxRzSWA29ifj3tktNPkgrANCVX3RNU=; b=RTqkDyNw6aDUQz5HOUaIC5F0dVmrtM3J/ZKYbhq1/iqWNtLwH8edGZCs5hUlZ+61aK FjKdFeLr6AAw/K3L5BTLQxrXTrP4FVCqlRLm7PvtK3aNK6s43xan32Q+4mb4tJQZw1lc G2DiQoIQmu5GPa/CwOqXg+RWaBuBm7CzZ/itm2qiq4plDP28X/NXtiJZ2lQsm/uBGN4t kTGEns3v1LvaQiFhe2VHqgkx4VBdibuSz11HxJJNzk+p2ZXQqazzEfksz2egUcEa0Pkz QzzObc9U2R8obEC3m5tfpDtDJgNC/+t72KzgOK+rxAn/Wf9cBxFJaFF2mMceT2qopcFz 6LtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=4jyR/PHSHUcFWjxRzSWA29ifj3tktNPkgrANCVX3RNU=; b=kyBBtZnP4//QLxzPGgtA40mvX1MYefw4cwQfy5ymPx5uX8v70I0NrizhkspbqOf5cd ihR0rxl+eTto6GqtcInq1HWi1EWWt6kp2TV87x/bxIdLrnXYPrjLs47im/idne1ZEKEC ZeT0PW0xxwlnaOefdIUu2oRcfPsRQ48v5Uz2ykX5wRKwg/07v/LgWI0mlOhUg4mbxuPM kTRMvNPDxZa2RUKebYx3G6IwToPQTXj6JIx+DorUTKaJRWbElOJf363YtoNn10qds/H9 X67Ds84HKo3x/UbeAEjYpbTUCGI5nLDZfh1WQGI5RpmkhkmrGFuRjj7xaTVVJ2J2KlVf RTog== X-Gm-Message-State: ANoB5pkTQa/m7bNSY78+ITAx9QbCUjYQKIwGOPwQHD50bRKMRzzGhfP/ FTkmnUfa0y0P0xchnLXnm2sepb2BhGQ= X-Google-Smtp-Source: AA0mqf6XDvKTW3Vhbf7AS8pMHycurcpX8aIELFeNlga6JDek/Pce+BVpAvJBKBjQYN8iIkykNQHMdg== X-Received: by 2002:a05:620a:608c:b0:6ed:2f5f:cdd1 with SMTP id dx12-20020a05620a608c00b006ed2f5fcdd1mr52500266qkb.9.1669757907316; Tue, 29 Nov 2022 13:38:27 -0800 (PST) Original-Received: from muffinmac ([193.19.254.90]) by smtp.gmail.com with ESMTPSA id o22-20020a05620a2a1600b006eeb3165554sm11392588qkp.19.2022.11.29.13.38.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Nov 2022 13:38:26 -0800 (PST) In-Reply-To: <87edtlbghf.fsf@posteo.net> (Philip Kaludercic's message of "Tue, 29 Nov 2022 21:25:32 +0000") 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:249448 Archived-At: --=-=-= Content-Type: text/plain Philip Kaludercic writes: >>>> + ((file-regular-p file))) >>> >>> Shouldn't we keep `file-readable-p'? >> >> I think we should use `file-regular-p' so even if the pkg-dir will >> contain directory named "news" we will not try to insert it with >> `insert-file-contents'. > > I agree that `file-regular-p' is sensible, what I meant was using > `file-readable-p' in addition to that. But I guess that all in all, > this is a rare circumstance... Oh, right. Makes sense. I've updated the patch. --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-Insert-news-for-installed-packages-only.patch >From ac7fddd70d8cc1ff946826d4624370538032de7a 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 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index 8d44fae30a0..99538df228b 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -2696,7 +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)) + (news (and-let* (pkg-dir + ((not built-in)) + (file (expand-file-name "news" pkg-dir)) + ((file-regular-p file)) ((file-readable-p file))) file))) (when (string= status "avail-obso") -- 2.32.1 (Apple Git-133) --=-=-=--