emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] master f674de6: emacs-lisp/package.el: Don't overwrite dow


From: Artur Malabarba
Subject: [Emacs-diffs] master f674de6: emacs-lisp/package.el: Don't overwrite downloads-in-progress.
Date: Sat, 04 Apr 2015 19:25:13 +0000

branch: master
commit f674de6f08e3789fed88f24ffc45bfffc8d60520
Author: Artur Malabarba <address@hidden>
Commit: Artur Malabarba <address@hidden>

    emacs-lisp/package.el: Don't overwrite downloads-in-progress.
---
 lisp/ChangeLog             |    6 ++++++
 lisp/emacs-lisp/package.el |    4 +++-
 2 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5a7d953..9b2b312 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2015-04-04  Artur Malabarba  <address@hidden>
+
+       * 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  <address@hidden>
 
        * 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 583598e..3f77840 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)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]