Commit 6f6d5256 authored by Noam Postavsky's avatar Noam Postavsky

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.
parent 12c77f69
......@@ -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))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment