From: Artur Malabarba Date: Sat, 4 Apr 2015 19:20:21 +0000 (+0100) Subject: emacs-lisp/package.el: Don't overwrite downloads-in-progress. X-Git-Tag: emacs-25.0.90~2564^2~7 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f674de6f08e3789fed88f24ffc45bfffc8d60520;p=emacs.git emacs-lisp/package.el: Don't overwrite downloads-in-progress. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5a7d953a613..9b2b3121439 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2015-04-04 Artur Malabarba + + * emacs-lisp/package.el (package--download-and-read-archives): Add + `package-archives' to `package--downloads-in-progress' instead of + overwriting it. + 2015-04-04 Michael Albinus * net/tramp-cache.el (tramp-flush-directory-property): Quote directory diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index 583598ee10c..3f7784032e4 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -1410,7 +1410,9 @@ This populates `package-archive-contents'. If ASYNC is non-nil, perform the downloads asynchronously." ;; The downloaded archive contents will be read as part of ;; `package--update-downloads-in-progress'. - (setq package--downloads-in-progress package-archives) + (setq package--downloads-in-progress + (append package-archives + package--downloads-in-progress)) (dolist (archive package-archives) (condition-case-unless-debug nil (package--download-one-archive archive "archive-contents" async)