branch: elpa-admin
commit e2b9274160a520e14a09adeff87b144c5780aa5d
Author: Thien-Thi Nguyen <t...@gnu.org>
Commit: Thien-Thi Nguyen <t...@gnu.org>
[admin int] Simplify ‘archive--write-pkg-file’ calling convention.
* admin/archive-contents.el (archive--write-pkg-file):
No longer take VERSION, DESC, REQUIRES, EXTRAS; instead,
take METADATA and destructure it to obtain those values.
(batch-make-archive, archive--refresh-pkg-file):
Update calls to ‘archive--write-pkg-file’ accordingly.
---
admin/archive-contents.el | 36 ++++++++++++++++++------------------
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/admin/archive-contents.el b/admin/archive-contents.el
index 6ebf5dd..7ec415c 100755
--- a/admin/archive-contents.el
+++ b/admin/archive-contents.el
@@ -86,8 +86,7 @@ Delete backup files also."
(apply #'archive--process-simple-package
dir pkg (cdr metadata))
(if (nth 1 metadata)
- (apply #'archive--write-pkg-file
- dir pkg (cdr metadata)))
+ (archive--write-pkg-file dir pkg metadata))
(archive--process-multi-file-package dir pkg))
packages)))))
((debug error) (error "Error in %s: %S" dir v))))
@@ -323,10 +322,9 @@ Rename DIR/ to PKG-VERS/, and return the descriptor."
(defun archive--refresh-pkg-file ()
(let* ((dir (directory-file-name default-directory))
(pkg (file-name-nondirectory dir)))
- (apply #'archive--write-pkg-file dir pkg
- (cdr (archive--metadata dir pkg)))))
+ (archive--write-pkg-file dir pkg (archive--metadata dir pkg))))
-(defun archive--write-pkg-file (pkg-dir name version desc requires extras)
+(defun archive--write-pkg-file (pkg-dir name metadata)
(let ((pkg-file (expand-file-name (concat name "-pkg.el") pkg-dir))
(print-level nil)
(print-quoted t)
@@ -335,19 +333,21 @@ Rename DIR/ to PKG-VERS/, and return the descriptor."
(concat (format ";; Generated package description from %s.el\n"
name)
(prin1-to-string
- (nconc
- (list 'define-package
- name
- version
- desc
- (list 'quote
- ;; Turn version lists into string form.
- (mapcar
- (lambda (elt)
- (list (car elt)
- (package-version-join (cadr elt))))
- requires)))
- (archive--alist-to-plist-args extras)))
+ (cl-destructuring-bind (version desc requires extras)
+ (cdr metadata)
+ (nconc
+ (list 'define-package
+ name
+ version
+ desc
+ (list 'quote
+ ;; Turn version lists into string form.
+ (mapcar
+ (lambda (elt)
+ (list (car elt)
+ (package-version-join (cadr elt))))
+ requires)))
+ (archive--alist-to-plist-args extras))))
"\n")
nil
pkg-file)))
