aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArtur Malabarba2015-04-04 20:20:21 +0100
committerArtur Malabarba2015-04-04 20:22:26 +0100
commitf674de6f08e3789fed88f24ffc45bfffc8d60520 (patch)
tree7d2e84c18de6a8c04c8702d1ebd64c6497e5999d
parent5824dd5b6a67b3de83d281049d3694066e1462a7 (diff)
downloademacs-f674de6f08e3789fed88f24ffc45bfffc8d60520.tar.gz
emacs-f674de6f08e3789fed88f24ffc45bfffc8d60520.zip
emacs-lisp/package.el: Don't overwrite downloads-in-progress.
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/emacs-lisp/package.el4
2 files changed, 9 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5a7d953a613..9b2b3121439 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12015-04-04 Artur Malabarba <bruce.connor.am@gmail.com>
2
3 * emacs-lisp/package.el (package--download-and-read-archives): Add
4 `package-archives' to `package--downloads-in-progress' instead of
5 overwriting it.
6
12015-04-04 Michael Albinus <michael.albinus@gmx.de> 72015-04-04 Michael Albinus <michael.albinus@gmx.de>
2 8
3 * net/tramp-cache.el (tramp-flush-directory-property): Quote directory 9 * 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,
1410perform the downloads asynchronously." 1410perform the downloads asynchronously."
1411 ;; The downloaded archive contents will be read as part of 1411 ;; The downloaded archive contents will be read as part of
1412 ;; `package--update-downloads-in-progress'. 1412 ;; `package--update-downloads-in-progress'.
1413 (setq package--downloads-in-progress package-archives) 1413 (setq package--downloads-in-progress
1414 (append package-archives
1415 package--downloads-in-progress))
1414 (dolist (archive package-archives) 1416 (dolist (archive package-archives)
1415 (condition-case-unless-debug nil 1417 (condition-case-unless-debug nil
1416 (package--download-one-archive archive "archive-contents" async) 1418 (package--download-one-archive archive "archive-contents" async)