From: Noam Postavsky <npostavs@gmail.com>
Date: Sat, 16 Jun 2018 22:59:43 +0000 (-0400)
Subject: Detect a non-list package archive content properly (Bug#22311)
X-Git-Tag: emacs-26.1.90~319
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6f6d525683d5731d55fcd801a66b078bd6ba8369;p=emacs.git

Detect a non-list package archive content properly (Bug#22311)

* lisp/emacs-lisp/package.el (package--download-one-archive): Use
`read' instead of `read-from-string'; the latter always returns a
cons, so the `listp' check on its return value doesn't make sense.  It
was changed from `read' to `read-from-string' in 2015-04-01 "*
emacs-lisp/package.el: Implement asynchronous refreshing", but that
change was not needed because `read' works fine on strings as well as
buffers.
---

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index c56502236ee..576a9bc7e73 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -1532,7 +1532,7 @@ similar to an entry in `package-alist'.  Save the cached copy to
            (content (buffer-string))
            (dir (expand-file-name (format "archives/%s" name) package-user-dir))
            (local-file (expand-file-name file dir)))
-      (when (listp (read-from-string content))
+      (when (listp (read content))
         (make-directory dir t)
         (if (or (not package-check-signature)
                 (member name package-unsigned-archives))