[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa-admin 75bab1c 309/439: * admin/archive-contents.el: Fix ca
From: |
Philip Kaludercic |
Subject: |
[nongnu] elpa-admin 75bab1c 309/439: * admin/archive-contents.el: Fix case of non-versions dependencies |
Date: |
Sun, 17 Oct 2021 15:48:26 -0400 (EDT) |
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"
- [nongnu] elpa-admin d5be3dd 283/439: * README: mention make check_copyrights, (continued)
- [nongnu] elpa-admin d5be3dd 283/439: * README: mention make check_copyrights, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin d220792 286/439: Add 'packages/mmm-mode/' from commit '00c10a69c8c90178530219730ccea14ab634a74e', Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 8c08096 285/439: * GNUmakefile (org-fetch): Don't stop the whole update if it fails., Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin d276c3d 288/439: * README: Don't clone a clone., Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 5dc3bcb 289/439: Use "git worktree list" in archive-contents.el, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin eb92dfc 293/439: Fix repo links for :core packages, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin dbd4e0b 295/439: Merge remote-tracking branch 'refs/remotes/origin/master', Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin d58576c 301/439: * GNUmakefile (FILTER-nonsrc): Don't compile .dir-locals.el files., Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 0e7eab5 304/439: Merge commit 'facd92f4c026525706a48b96b4e0b24543ce1d94', Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 21c69f7 308/439: Merge commit 'c304ac9a80ab7e96f705771a3842a48bf5a32c8a', Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 75bab1c 309/439: * admin/archive-contents.el: Fix case of non-versions dependencies,
Philip Kaludercic <=
- [nongnu] elpa-admin 26a2da8 312/439: More specific externals example., Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin cdefe40 311/439: Improve copying of :core files; update .gitignore, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 86e31b7 313/439: Merge branch 'master' of git://bzr.sv.gnu.org/emacs/elpa, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin adf3b7f 316/439: Neater HTML table of old package versions (bug#35331), Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 55ff372 317/439: * admin/archive-contents.el: Improve package HTML headers, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin d0cae44 318/439: * admin/archive-contents.el: Unbreak elpa.gnu.org build, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 0b90b0a 322/439: * GNUmakefile (check_copyrights): Only look at "copyright" in comments, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin cabbab9 323/439: * packages/yasnippet: Merge 0.14.0 from upstream., Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 5da248f 325/439: * GNUmakefile (process-archive): Fix placement of --exclude and -X, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin f79d3e5 327/439: Merge commit 'b49ba259cc7e490e8acdecd28e66063f5ad1325e', Philip Kaludercic, 2021/10/17