diff options
| author | Glenn Morris <rgm@gnu.org> | 2014-03-21 12:04:57 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2014-03-21 12:04:57 -0700 |
| commit | 5671dc515946c8a27b09d060bc34345d42a8fa6e (patch) | |
| tree | 54668c08879422e9c9d8c8c7a9e612d357971a49 /lisp/emacs-lisp/package.el | |
| parent | 26e91130ed0611a1074d0cac5880c065f9ba69c8 (diff) | |
| parent | 1e92a8a3aa7958ba699cd0430be4f23aff6c4c01 (diff) | |
| download | emacs-5671dc515946c8a27b09d060bc34345d42a8fa6e.tar.gz emacs-5671dc515946c8a27b09d060bc34345d42a8fa6e.tar.bz2 emacs-5671dc515946c8a27b09d060bc34345d42a8fa6e.zip | |
Merge from emacs-24; up to 2014-03-21T08:51:02Z!eliz@gnu.org
Diffstat (limited to 'lisp/emacs-lisp/package.el')
| -rw-r--r-- | lisp/emacs-lisp/package.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index e0d1c99d369..ae2c2862887 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -923,10 +923,10 @@ not included in this list." (setq already pkg))) (cond (already - (if (version-list-< next-version (package-desc-version already)) + (if (version-list-<= next-version (package-desc-version already)) ;; Move to front, so it gets installed early enough (bug#14082). (setq packages (cons already (delq already packages))) - (error "Need package `%s-%s', but only %s is available" + (error "Need package `%s-%s', but only %s is being installed" next-pkg (package-version-join next-version) (package-version-join (package-desc-version already))))) |