* emacs-lisp/package.el (package-directory-list): Only call file-name-nondirectory...

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index efec2b3fcb4384334d787f15874ae9e92e106b03..28092a6a086501ab660c922f374b99697f7b006f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-04  Noorul Islam K M  <noorul@noorul.com>  (tiny change)
+
+       * emacs-lisp/package.el (package-directory-list): Only call
+       file-name-nondirectory on a string.
+
 2010-09-02  Chong Yidong  <cyd@stupidchicken.com>
 
        * emacs-lisp/package.el (package--download-one-archive): Ensure

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 6c5aee2a73588f0bd7356f0d15ec86117cc1e9c6..54c6a09dd9d901eb88c6021c6fa4633400fb0f6b 100644 (file)
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -260,8 +260,9 @@ packages in `package-directory-list'."
   ;; Defaults are subdirs named "elpa" in the site-lisp dirs.
   (let (result)
     (dolist (f load-path)
-      (if (equal (file-name-nondirectory f) "site-lisp")
-         (push (expand-file-name "elpa" f) result)))
+      (and (stringp f)
+          (equal (file-name-nondirectory f) "site-lisp")
+          (push (expand-file-name "elpa" f) result)))
     (nreverse result))
   "List of additional directories containing Emacs Lisp packages.
 Each directory name should be absolute.