diff options
| author | Yuri D'Elia <wavexx@thregr.org> | 2018-07-17 12:59:35 +0200 |
|---|---|---|
| committer | Noam Postavsky <npostavs@gmail.com> | 2018-08-11 21:06:26 -0400 |
| commit | d2ad4ba4f3c5db6f6be7d73c17332e9bc4570e29 (patch) | |
| tree | 08b3c715d70af082a9bfa619ec91c50dab9115b5 /lisp | |
| parent | ec0995c40901a5b11d42c8a5fafd26771c76b17c (diff) | |
| download | emacs-d2ad4ba4f3c5db6f6be7d73c17332e9bc4570e29.tar.gz emacs-d2ad4ba4f3c5db6f6be7d73c17332e9bc4570e29.tar.bz2 emacs-d2ad4ba4f3c5db6f6be7d73c17332e9bc4570e29.zip | |
Do not consider external packages to be removable (Bug#27822)
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 (package--user-installed-p): New
function.
(package--removable-packages): Use it.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/emacs-lisp/package.el | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index 576a9bc7e73..207c2e5c489 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -1730,6 +1730,15 @@ if it is still empty." (indirect indirect-deps) (t (delete-dups (append direct-deps indirect-deps)))))) +(defun package--user-installed-p (package) + "Return non-nil if PACKAGE is a user-installed package. +PACKAGE is the package name, a symbol. Check whether the package +was installed into `package-user-dir' where we assume to have +control over." + (let* ((pkg-desc (cadr (assq package 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 @@ -1739,7 +1748,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) |