From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Yuri D'Elia Newsgroups: gmane.emacs.devel Subject: [PATCH] do not auto-remove external packages (fixes #27822) Date: Tue, 17 Jul 2018 13:16:04 +0200 Message-ID: <877elugljf.fsf@wavexx.thregr.org> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: blaine.gmane.org 1531826056 3433 195.159.176.226 (17 Jul 2018 11:14:16 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Tue, 17 Jul 2018 11:14:16 +0000 (UTC) To: emacs-devel@gnu.org, 27822@debbugs.gnu.org, Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Jul 17 13:14:12 2018 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ffNvn-0000nG-BF for ged-emacs-devel@m.gmane.org; Tue, 17 Jul 2018 13:14:11 +0200 Original-Received: from localhost ([::1]:58289 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffNxu-0004c8-2U for ged-emacs-devel@m.gmane.org; Tue, 17 Jul 2018 07:16:22 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:41551) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffNxk-0004bp-CM for emacs-devel@gnu.org; Tue, 17 Jul 2018 07:16:13 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ffNxj-0005Cc-2I for emacs-devel@gnu.org; Tue, 17 Jul 2018 07:16:12 -0400 Original-Received: from erc.thregr.org ([2001:41c9:1:41f::63]:45970) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ffNxi-00059H-Nq for emacs-devel@gnu.org; Tue, 17 Jul 2018 07:16:10 -0400 Original-Received: from [2a02:27e8:20:9049:4a2a:e3ff:fe02:7265] (helo=localhost) by erc.thregr.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) id 1ffNxd-0001Im-5f (envelope-from ); Tue, 17 Jul 2018 13:16:05 +0200 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:41c9:1:41f::63 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:227497 Archived-At: --=-=-= Content-Type: text/plain User-agent: mu4e 1.1.0; emacs 27.0.50 The package-autoremove machinery assumes all packages which are not user-selected are removable (see https://debbugs.gnu.org/cgi/bugreport.cgi?bug=27822) However this is blatantly untrue. For example, in debian unstable, emacs packages can be installed system-wide via apt as well (see all the elpa-* packages). Such packages _cannot_ and shouldn't be auto-removed. The following patch checks whether a package has been _directly_ installed into `package-user-dir' before marking it eligible for auto-removal. [copyright assignment already done] --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-Do-not-consider-external-packages-to-be-removable.patch >From 5a4234b3c1289960fd760256aa6399efbd04bfc3 Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Tue, 17 Jul 2018 12:59:35 +0200 Subject: [PATCH] Do not consider external packages to be removable Packages which are not directly user-installed shouldn't be autoremoved, since they can be setup through a different path (via `package-directory-list') where we have no authority over. --- lisp/emacs-lisp/package.el | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index 36233522..534f155c 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -1754,6 +1754,15 @@ if it is still empty." (indirect indirect-deps) (t (delete-dups (append direct-deps indirect-deps)))))) +(defun package--user-installed-p (pkg) + "Check if the package is a user-installed package. +PKG is a package name. +Checks whether the package was installed into `package-user-dir' where +we assume to have control over." + (let* ((pkg-desc (cadr (assq pkg package-alist))) + (dir (package-desc-dir pkg-desc))) + (file-in-directory-p dir package-user-dir))) + (defun package--removable-packages () "Return a list of names of packages no longer needed. These are packages which are neither contained in @@ -1763,7 +1772,9 @@ These are packages which are neither contained in ;; `p' and its dependencies are needed. append (cons p (package--get-deps p))))) (cl-loop for p in (mapcar #'car package-alist) - unless (memq p needed) + unless (or (memq p needed) + ;; do not auto-remove external packages + (not (package--user-installed-p p))) collect p))) (defun package--used-elsewhere-p (pkg-desc &optional pkg-list all) -- 2.18.0 --=-=-=--