Commit b47fe819 authored by Artur Malabarba's avatar Artur Malabarba

emacs-lisp/package.el: Prevent outdated downloads-in-progress.

parent 16eec6fc
......@@ -14,6 +14,9 @@
`package-archives' to `package--downloads-in-progress' instead of
overwriting it.
(package--with-work-buffer-async): Protect macro arguments.
(package--download-one-archive)
(package--download-and-read-archives): Prevent
downloads-in-progress list from becoming outdated.
2015-04-04 Michael Albinus <michael.albinus@gmx.de>
......
......@@ -1397,8 +1397,12 @@ similar to an entry in `package-alist'. Save the cached copy to
;; If we care, check it (perhaps async) and *then* write the file.
(package--check-signature
location file content async
;; This function will be called after signature checking.
(lambda (&optional good-sigs)
(unless (or good-sigs (eq package-check-signature 'allow-unsigned))
;; Even if the sig fails, this download is done, so
;; remove it from the in-progress list.
(package--update-downloads-in-progress archive)
(error "Unsigned archive `%s'" name))
;; Write out the archives file.
(write-region content nil local-file nil 'silent)
......@@ -1419,7 +1423,11 @@ perform the downloads asynchronously."
package--downloads-in-progress))
(dolist (archive package-archives)
(condition-case-unless-debug nil
(package--download-one-archive archive "archive-contents" async)
(package--download-one-archive
archive "archive-contents"
;; Called if the async download fails
(when async
(lambda () (package--update-downloads-in-progress archive))))
(error (message "Failed to download `%s' archive."
(car archive))))))
......
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