From: Dmitry Gutov <dgutov@yandex.ru>
Date: Thu, 18 Dec 2014 16:44:11 +0000 (+0200)
Subject: Fixes: debbugs:19390
X-Git-Tag: emacs-25.0.90~2635^2~36
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=36c43e95de5e067b7d6a06db479765b4e4a22986;p=emacs.git

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 b207deea0de..16590271ec4 100644
--- 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 1949d0d474c..11333ec3d78 100644
--- 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'.