[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] elpa-admin 285d815 049/357: Fix last change.
From: |
Stefan Monnier |
Subject: |
[elpa] elpa-admin 285d815 049/357: Fix last change. |
Date: |
Thu, 10 Dec 2020 18:06:13 -0500 (EST) |
branch: elpa-admin
commit 285d8159198dd2fe3f613db25f65a669228b3df4
Author: Chong Yidong <cyd@stupidchicken.com>
Commit: Chong Yidong <cyd@stupidchicken.com>
Fix last change.
---
admin/archive-contents.el | 80 ++++++++++++++++++++++++-----------------------
1 file changed, 41 insertions(+), 39 deletions(-)
diff --git a/admin/archive-contents.el b/admin/archive-contents.el
index 2f70c2d..cb2c646 100644
--- a/admin/archive-contents.el
+++ b/admin/archive-contents.el
@@ -45,9 +45,9 @@ Otherwise return nil."
(defun batch-make-archive-contents ()
(let ((packages '(1))) ; format-version.
(dolist (file (directory-files default-directory))
- (condition-case nil
+ (condition-case v
(cond
- ((memq file '("." ".." "elpa.rss" "archive-contents"))
+ ((member file '("." ".." "elpa.rss" "archive-contents"))
nil)
;; Multi-file package
((file-directory-p file)
@@ -76,45 +76,47 @@ Otherwise return nil."
;; Simple package
((string-match "\\([^/]+\\)\\.el\\'" file)
(let* ((pkg (match-string 1 file))
- (desc
- (with-temp-buffer
- (insert-file-contents file)
- (goto-char (point-min))
- (unless (looking-at ";;;.*---[ \t]*\\(.*\\)\\(-\\*-.*-\\*-[
\t]*\\)?$")
- (error "Incorrectly formatted header in %s" file))
- (prog1 (match-string 1)
- (let ((commentary (lm-commentary)))
- (with-current-buffer (find-file-noselect
- (concat pkg "-readme.txt"))
- (erase-buffer)
- (emacs-lisp-mode)
- (insert (or commentary
- (prog1 "No description"
- (message "Missing Commentary in %s"
- file))))
- (goto-char (point-min))
- (while (looking-at ";*[ \t]*\\(commentary[:
\t]*\\)?\n")
- (delete-region (match-beginning 0)
- (match-end 0)))
- (uncomment-region (point-min) (point-max))
- (goto-char (point-max))
- (while (progn (forward-line -1)
- (looking-at "[ \t]*\n"))
- (delete-region (match-beginning 0)
- (match-end 0)))
- (save-buffer))))))
- (vers (or (archive-contents--strip-rcs-id (lm-header
"package-version"))
- (archive-contents--strip-rcs-id (lm-header
"version"))
- (error "Missing version number in %s" file)))
- (requires-str (lm-header "package-requires"))
- (req (if requires-str
+ vers desc requires-str req)
+ (with-temp-buffer
+ (insert-file-contents file)
+ (goto-char (point-min))
+ (unless (looking-at ";;;.*---[ \t]*\\(.*\\)\\(-\\*-.*-\\*-[
\t]*\\)?$")
+ (error "Incorrectly formatted header in %s" file))
+ (setq vers
+ (or (archive-contents--strip-rcs-id (lm-header
"package-version"))
+ (archive-contents--strip-rcs-id (lm-header "version"))
+ (error "Missing version number in %s" file)))
+ (setq desc (match-string 1))
+ (let ((commentary (lm-commentary)))
+ (with-current-buffer (find-file-noselect
+ (concat pkg "-readme.txt"))
+ (erase-buffer)
+ (emacs-lisp-mode)
+ (insert (or commentary
+ (prog1 "No description"
+ (message "Missing Commentary in %s"
+ file))))
+ (goto-char (point-min))
+ (while (looking-at ";*[ \t]*\\(commentary[: \t]*\\)?\n")
+ (delete-region (match-beginning 0)
+ (match-end 0)))
+ (uncomment-region (point-min) (point-max))
+ (goto-char (point-max))
+ (while (progn (forward-line -1)
+ (looking-at "[ \t]*\n"))
+ (delete-region (match-beginning 0)
+ (match-end 0)))
+ (save-buffer)))
+ (setq req
+ (let ((requires-str (lm-header "package-requires")))
+ (if requires-str
(mapcar 'archive-contents--convert-require
(car (read-from-string requires-str))))))
- (push (cons (intern pkg)
- (vector (version-to-list vers) req desc 'single))
- packages)
- (rename-file file (concat (or (file-name-directory file) "")
- pkg "-" vers ".el"))))
+ (push (cons (intern pkg)
+ (vector (version-to-list vers) req desc 'single))
+ packages)
+ (rename-file file (concat (or (file-name-directory file) "")
+ pkg "-" vers ".el")))))
((not (or (string-match "\\.elc\\'" file)
(string-match "-readme\\.txt\\'" file)))
(message "Unknown file %s" file)))
- [elpa] elpa-admin 370423c 026/357: * COPYING, ChangeLog, README, admin/org-synch.el,, (continued)
- [elpa] elpa-admin 370423c 026/357: * COPYING, ChangeLog, README, admin/org-synch.el,, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 20cbb20 002/357: * sml-mode.texi: somewhat updated the doc., Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 6ee3dad 009/357: Added script and documentation for installing from CVS, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 102fabb 013/357: Start the Grand Unified Debugger Rewrite., Stefan Monnier, 2020/12/10
- [elpa] elpa-admin f545af1 036/357: Rephrase some parts of README, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 487ee79 022/357: Update README to note dependencies and what debugger's we've got., Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 1761424 031/357: Use archive-contents.el script., Stefan Monnier, 2020/12/10
- [elpa] elpa-admin ce02925 001/357: Initial revision, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin b824440 047/357: Minor rephrasing in README, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin b25e1bf 039/357: Rephrase documentation and comments, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 285d815 049/357: Fix last change.,
Stefan Monnier <=
- [elpa] elpa-admin 303f2c9 075/357: * admin/archive-contents.el (batch-make-site-package): New function., Stefan Monnier, 2020/12/10
- [elpa] elpa-admin dfa5808 053/357: Rework archive-contents.el to handle new packages/ structure., Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 6c94727 068/357: archive-contents.el (archive--simple-package-p): Fix prop-line matching., Stefan Monnier, 2020/12/10
- [elpa] elpa-admin da7456c 065/357: write README in markdown, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 49fce77 070/357: Rename README to README.rst, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin cbd75c6 082/357: README.md, load-relative.el: Go over documentation. Makefile.am: add targets test and test-short, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin c497b5b 083/357: * GNUmakefile: Rename from Makefile. Add targets for in-place use., Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 42c5112 084/357: * GNUmakefile (%.elc): Don't depend on $(autoloads) since that causes, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 480283a 089/357: Move check_copyright to the makefile, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin bffc4a6 090/357: Don't create local branches, Stefan Monnier, 2020/12/10