branch: externals/package-x
commit 948e9b97801befab462ae9487985b01ef92e76db
Author: Juanma Barranquero <lek...@gmail.com>
Commit: Juanma Barranquero <lek...@gmail.com>
lisp/emacs-lisp/package-x.el: Follow-up to change in package.el.
(package--archive-contents-from-url): Use url-insert-file-contents;
package-handle-response no longer exists.
---
lisp/emacs-lisp/package-x.el | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)
diff --git a/lisp/emacs-lisp/package-x.el b/lisp/emacs-lisp/package-x.el
index 6a6a62dc91..1d9d1a0466 100644
--- a/lisp/emacs-lisp/package-x.el
+++ b/lisp/emacs-lisp/package-x.el
@@ -114,18 +114,12 @@ inserted after its first occurrence in the file."
(defun package--archive-contents-from-url (archive-url)
"Parse archive-contents file at ARCHIVE-URL.
Return the file contents, as a string, or nil if unsuccessful."
- (ignore-errors
- (when archive-url
- (let* ((buffer (url-retrieve-synchronously
- (concat archive-url "archive-contents"))))
- (set-buffer buffer)
- (package-handle-response)
- (re-search-forward "^$" nil 'move)
- (forward-char)
- (delete-region (point-min) (point))
- (prog1 (package-read-from-string
- (buffer-substring-no-properties (point-min) (point-max)))
- (kill-buffer buffer))))))
+ (when archive-url
+ (with-temp-buffer
+ (ignore-errors
+ (url-insert-file-contents (concat archive-url "archive-contents"))
+ (package-read-from-string
+ (buffer-substring-no-properties (point-min) (point-max)))))))
(defun package--archive-contents-from-file ()
"Parse the archive-contents at `package-archive-upload-base'"
