[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] elpa-admin c943660 310/357: Merge commit '98405112baa5ce2a118d1c6
From: |
Stefan Monnier |
Subject: |
[elpa] elpa-admin c943660 310/357: Merge commit '98405112baa5ce2a118d1c65184c005d8ddaa1a9' |
Date: |
Thu, 10 Dec 2020 18:07:05 -0500 (EST) |
branch: elpa-admin
commit c943660b863ba37a569593f5b7a93a716c603363
Merge: 21c69f7 75bab1c
Author: Stephen Leake <stephen_leake@stephe-leake.org>
Commit: Stephen Leake <stephen_leake@stephe-leake.org>
Merge commit '98405112baa5ce2a118d1c65184c005d8ddaa1a9'
---
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 2f122b0 251/357: Merge branch 'master' into new-website, (continued)
- [elpa] elpa-admin 2f122b0 251/357: Merge branch 'master' into new-website, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin da3bd64 263/357: [admin int] Use ‘archive--read-externals-list’ more., Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 34ecb5f 257/357: Respect .elpaignore when compiling and optimize compilation., Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 186d10f 269/357: Clear executable bit for Emacs Lisp files., Stefan Monnier, 2020/12/10
- [elpa] elpa-admin ac713ed 242/357: Merge commit 'bdbbc65028af8deb55a4e474be43b5b99e6cc539', Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 5660f25 261/357: [admin] Add abstraction: archive--read-externals-list, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin a23a8b8 271/357: Merge branch 'scratch/hook-helpers', Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 1325337 262/357: [admin int] Simplify ‘archive-gitignore-externals’., Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 84f67ae 294/357: * admin/archive-contents.el (archive--insert-repolinks): Fix last change, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 655d2e7 305/357: Update packages/ack from upstream, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin c943660 310/357: Merge commit '98405112baa5ce2a118d1c65184c005d8ddaa1a9',
Stefan Monnier <=
- [elpa] elpa-admin adf3b7f 316/357: Neater HTML table of old package versions (bug#35331), Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 9c8cf14 320/357: * admin/archive-contents.el (archive-refresh-pkg-file): Resurrect., Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 4fc4d47 321/357: Merge commit '5b562e4ddfc449cd61c82ef7646a6c501b913b6c', Stefan Monnier, 2020/12/10
- [elpa] elpa-admin cabbab9 323/357: * packages/yasnippet: Merge 0.14.0 from upstream., Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 5ef13b0 326/357: Merge commit '33afdb46e1cd61251736816d965495525b36c9cd', Stefan Monnier, 2020/12/10
- [elpa] elpa-admin d30f5d1 337/357: * GNUmakefile (RULE-singlepkg): New rule(s) to compile single-pkg (bug#38140), Stefan Monnier, 2020/12/10
- [elpa] elpa-admin a186f57 335/357: * README: Convert to org-mode and prepare for export., Stefan Monnier, 2020/12/10
- [elpa] elpa-admin f6670e0 334/357: * .gitignore: Ignore all the unregistered files under `packages`, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin cff34fa 336/357: Support generating readme.html from README, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 9822a67 315/357: README: Mention that the copyright in ELPA is with the FSF, Stefan Monnier, 2020/12/10