summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp/package-x.el
diff options
context:
space:
mode:
authorJuanma Barranquero <lekktu@gmail.com>2014-03-27 01:20:50 +0100
committerJuanma Barranquero <lekktu@gmail.com>2014-03-27 01:20:50 +0100
commitb1c870c9e8b8fd7001234d60fbb110c028c2f350 (patch)
treeeb51e4f484ae326ee7cbd4037cfb59003d1b39b5 /lisp/emacs-lisp/package-x.el
parent3fd3e736934750c8b0e73b8327f0b75d3b09bf78 (diff)
downloademacs-b1c870c9e8b8fd7001234d60fbb110c028c2f350.tar.gz
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.
Diffstat (limited to 'lisp/emacs-lisp/package-x.el')
-rw-r--r--lisp/emacs-lisp/package-x.el18
1 files changed, 6 insertions, 12 deletions
diff --git a/lisp/emacs-lisp/package-x.el b/lisp/emacs-lisp/package-x.el
index 6a6a62dc916..1d9d1a04668 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'"