diff options
author | Chong Yidong <cyd@stupidchicken.com> | 2010-08-09 14:05:56 -0400 |
---|---|---|
committer | Chong Yidong <cyd@stupidchicken.com> | 2010-08-09 14:05:56 -0400 |
commit | 148cef8e7a25f4d05d3b90c78fd8714f64048d24 (patch) | |
tree | 71d6a540d19517206a421becf0cec58ec1c58b22 /lisp/emacs-lisp/package-x.el | |
parent | b84fc05a591171240d8842490d068356933eb5c2 (diff) | |
download | emacs-148cef8e7a25f4d05d3b90c78fd8714f64048d24.tar.gz emacs-148cef8e7a25f4d05d3b90c78fd8714f64048d24.tar.bz2 emacs-148cef8e7a25f4d05d3b90c78fd8714f64048d24.zip |
Use version-list-* functions in package.el.
* emacs-lisp/package-x.el (package-upload-buffer-internal): Use
version-to-list.
(package-upload-buffer-internal): Use version-list-<=.
* emacs-lisp/package.el (package-version-split)
(package--version-first-nonzero, package-version-compare):
Functions removed.
(package-directory-list, package-load-all-descriptors)
(package--built-in, package-activate, define-package)
(package-installed-p, package-compute-transaction)
(package-read-all-archive-contents)
(package--add-to-archive-contents, package-buffer-info)
(package-tar-file-info, package-list-packages-internal): Use
version-to-list and version-list-*.
Diffstat (limited to 'lisp/emacs-lisp/package-x.el')
-rw-r--r-- | lisp/emacs-lisp/package-x.el | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lisp/emacs-lisp/package-x.el b/lisp/emacs-lisp/package-x.el index 2a5d84f339b..b93950049e0 100644 --- a/lisp/emacs-lisp/package-x.el +++ b/lisp/emacs-lisp/package-x.el @@ -129,7 +129,7 @@ If nil, the \"gnu\" archive is used." (aref pkg-info 2))) (pkg-version (aref pkg-info 3)) (commentary (aref pkg-info 4)) - (split-version (package-version-split pkg-version)) + (split-version (version-to-list pkg-version)) (pkg-buffer (current-buffer)) ;; Download latest archive-contents. @@ -150,9 +150,8 @@ If nil, the \"gnu\" archive is used." (error "Unrecognized archive version %d" (car contents))) (let ((elt (assq pkg-name (cdr contents)))) (if elt - (if (package-version-compare split-version - (package-desc-vers (cdr elt)) - '<=) + (if (version-list-<= split-version + (package-desc-vers (cdr elt))) (error "New package has smaller version: %s" pkg-version) (setcdr elt new-desc)) (setq contents (cons (car contents) |