From: Artur Malabarba <bruce.connor.am@gmail.com>
Date: Fri, 29 May 2015 20:41:53 +0000 (+0100)
Subject: * lisp/emacs-lisp/package.el: Don't load from parent dir
X-Git-Tag: emacs-25.0.90~1926
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=56af96e54ee2402a07105fe60a5d6c34d697229d;p=emacs.git

* lisp/emacs-lisp/package.el: Don't load from parent dir

(package-load-all-descriptors): Don't load descriptors from
directories above the package directories.
---

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 97e6bd63da9..6fecd9a837d 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -587,9 +587,10 @@ updates `package-alist'."
   (dolist (dir (cons package-user-dir package-directory-list))
     (when (file-directory-p dir)
       (dolist (subdir (directory-files dir))
-        (let ((pkg-dir (expand-file-name subdir dir)))
-          (when (file-directory-p pkg-dir)
-            (package-load-descriptor pkg-dir)))))))
+        (unless (equal subdir "..")
+          (let ((pkg-dir (expand-file-name subdir dir)))
+            (when (file-directory-p pkg-dir)
+              (package-load-descriptor pkg-dir))))))))
 
 (defun define-package (_name-string _version-string
                                     &optional _docstring _requirements