Fixes: debbugs:19390

* lisp/emacs-lisp/package.el (package-activate): Do not re-activate or
reload the dependencies.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b207deea0de31641cbe75103ac72c67ed2393193..16590271ec4965a3d93e9a4b5b187ad0d1e64387 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-18  Dmitry Gutov  <dgutov@yandex.ru>
+
+       * emacs-lisp/package.el (package-activate): Do not re-activate or
+       reload the dependencies (bug#19390).
+
 2014-12-18  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * progmodes/cc-cmds.el (c-subword-mode): Alias to subword-mode.

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 1949d0d474ce0951ac61e68c5d0a5b91f8046823..11333ec3d78e6cd65381ace865158e8994af9a1a 100644 (file)
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -642,7 +642,7 @@ If FORCE is true, (re-)activate it if it's already activated."
              (fail (catch 'dep-failure
                      ;; Activate its dependencies recursively.
                      (dolist (req (package-desc-reqs pkg-vec))
-                       (unless (package-activate (car req) force)
+                       (unless (package-activate (car req))
                          (throw 'dep-failure req))))))
        (if fail
            (warn "Unable to activate package `%s'.