diff options
| author | Dmitry Gutov <dgutov@yandex.ru> | 2013-06-27 13:26:54 +0400 |
|---|---|---|
| committer | Dmitry Gutov <dgutov@yandex.ru> | 2013-06-27 13:26:54 +0400 |
| commit | 9ea5cf9fbd3c27ec743b6c42f64205054c8a130f (patch) | |
| tree | 4b6f61a911f05f3b36ef45d6999302ab2b1c0a1d /lisp/emacs-lisp | |
| parent | 1e0726398dd27532178fd0fb491872e7e2be396c (diff) | |
| download | emacs-9ea5cf9fbd3c27ec743b6c42f64205054c8a130f.tar.gz emacs-9ea5cf9fbd3c27ec743b6c42f64205054c8a130f.tar.bz2 emacs-9ea5cf9fbd3c27ec743b6c42f64205054c8a130f.zip | |
* automated/Makefile.in (setwins): Include the 'data' subdirectory.
* automated/package-x-test.el: New file.
* automated/package-test.el: New file.
* automated/data/package: New directory, with test examples.
* lisp/emacs-lisp/package-x.el (package-upload-buffer-internal): Adapt
to `package-desc-version' being a list. Use
`package--ac-desc-version' to retrieve version from a package
archive element.
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/package-x.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/emacs-lisp/package-x.el b/lisp/emacs-lisp/package-x.el index 628eb88eea0..76d7565d64b 100644 --- a/lisp/emacs-lisp/package-x.el +++ b/lisp/emacs-lisp/package-x.el @@ -204,12 +204,12 @@ if it exists." package--default-summary) (read-string "Description of package: ") (package-desc-summary pkg-desc))) - (pkg-version (package-desc-version pkg-desc)) + (split-version (package-desc-version pkg-desc)) (commentary (pcase file-type (`single (lm-commentary)) (`tar nil))) ;; FIXME: Get it from the README file. - (split-version (version-to-list pkg-version)) + (pkg-version (package-version-join split-version)) (pkg-buffer (current-buffer))) ;; Get archive-contents from ARCHIVE-URL if it's non-nil, or @@ -223,7 +223,7 @@ if it exists." (let ((elt (assq pkg-name (cdr contents)))) (if elt (if (version-list-<= split-version - (package-desc-version (cdr elt))) + (package--ac-desc-version (cdr elt))) (error "New package has smaller version: %s" pkg-version) (setcdr elt new-desc)) (setq contents (cons (car contents) |