[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] elpa-admin 75bab1c 309/357: * admin/archive-contents.el: Fix case
From: |
Stefan Monnier |
Subject: |
[elpa] elpa-admin 75bab1c 309/357: * admin/archive-contents.el: Fix case of non-versions dependencies |
Date: |
Thu, 10 Dec 2020 18:07:05 -0500 (EST) |
branch: elpa-admin
commit 75bab1cdff5b164d3f7c92ab0cde06c2a27de170
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Commit: Stefan Monnier <monnier@iro.umontreal.ca>
* admin/archive-contents.el: Fix case of non-versions dependencies
(archive--convert-require): Don't introduce invalid "version".
---
admin/archive-contents.el | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/admin/archive-contents.el b/admin/archive-contents.el
index 32f5285..3024543 100644
--- a/admin/archive-contents.el
+++ b/admin/archive-contents.el
@@ -41,8 +41,10 @@
l)))
(defun archive--convert-require (elt)
- (list (car elt)
- (archive--version-to-list (car (cdr elt)))))
+ (let ((vers (archive--version-to-list (car (cdr elt)))))
+ (if vers
+ (list (car elt) vers)
+ (list (car elt)))))
(defun archive--dirname (dir &optional base)
(file-name-as-directory (expand-file-name dir base)))
@@ -200,7 +202,7 @@ PKG is the name of the package and DIR is the directory
where it is."
(format archive-default-url-format pkg)))
(req
(and requires-str
- (mapcar 'archive--convert-require
+ (mapcar #'archive--convert-require
(car (read-from-string requires-str))))))
(list simple version description req
;; extra parameters
@@ -292,7 +294,7 @@ Rename DIR/ to PKG-VERS/, and return the descriptor."
(let* ((exp (archive--multi-file-package-def dir pkg))
(vers (nth 2 exp))
(req-exp (nth 4 exp))
- (req (mapcar 'archive--convert-require
+ (req (mapcar #'archive--convert-require
(if (eq 'quote (car-safe req-exp)) (nth 1 req-exp)
(when req-exp
(error "REQ should be a quoted constant: %S"
- [elpa] elpa-admin 5250761 270/357: * admin/archive-contents.el: Use `git worktree` for externals, (continued)
- [elpa] elpa-admin 5250761 270/357: * admin/archive-contents.el: Use `git worktree` for externals, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 334aa51 273/357: Merge commit 'a1130df3ada34e76675324a8c25823b420b20239', Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 5067b05 258/357: Change to package directory before checking .elpaignore exclusions., Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 82a2bda 259/357: Put tar'd files at the end to fix build in some environments., Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 7626ffa 254/357: Website footer improvement, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin dbd4e0b 295/357: Merge remote-tracking branch 'refs/remotes/origin/master', Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 02d8431 297/357: * admin/archive-contents.el (archive--insert-repolinks): Fix further yet, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 38e81a8 300/357: * README: Recommend "externals" and add some recommendations, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin a216465 299/357: * admin/archive-contents.el (archive--insert-repolinks): Whoops, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 0e7eab5 304/357: Merge commit 'facd92f4c026525706a48b96b4e0b24543ce1d94', Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 75bab1c 309/357: * admin/archive-contents.el: Fix case of non-versions dependencies,
Stefan Monnier <=
- [elpa] elpa-admin 86e31b7 313/357: Merge branch 'master' of git://bzr.sv.gnu.org/emacs/elpa, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 973ee9d 314/357: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs/elpa, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 0b90b0a 322/357: * GNUmakefile (check_copyrights): Only look at "copyright" in comments, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 5da248f 325/357: * GNUmakefile (process-archive): Fix placement of --exclude and -X, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 14797ea 319/357: * admin/archive-contents.el: Adjust last change, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin b69dfb7 324/357: Merge commit '8dbcc8e07c462777378cc859eced622ec9b0fc4d', Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 1b69bf6 340/357: * admin/archive-contents.el: Don't use "git log" when not needed, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 8ed7b88 354/357: Rename vars and functions with `elpaa-` prefix, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 7d65683 356/357: * admin/archive-contents.el: Fix wrong cgit links and support :core somewhat, Stefan Monnier, 2020/12/10