[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] elpa-admin 5660f25 261/357: [admin] Add abstraction: archive--rea
From: |
Stefan Monnier |
Subject: |
[elpa] elpa-admin 5660f25 261/357: [admin] Add abstraction: archive--read-externals-list |
Date: |
Thu, 10 Dec 2020 18:06:55 -0500 (EST) |
branch: elpa-admin
commit 5660f2567d23cbaea89e189c27af24892abd97f7
Author: Thien-Thi Nguyen <ttn@gnu.org>
Commit: Thien-Thi Nguyen <ttn@gnu.org>
[admin] Add abstraction: archive--read-externals-list
* admin/archive-contents.el (archive--read-externals-list): New func.
(archive--insert-repolinks, archive-add/remove/update-externals): Use it.
---
admin/archive-contents.el | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/admin/archive-contents.el b/admin/archive-contents.el
index 953a00b..66ea520 100755
--- a/admin/archive-contents.el
+++ b/admin/archive-contents.el
@@ -436,17 +436,19 @@ Rename DIR/ to PKG-VERS/, and return the descriptor."
(replace-regexp-in-string "<" "<"
(replace-regexp-in-string "&" "&" txt)))
+(defun archive--read-externals-list (&optional dir)
+ (with-temp-buffer
+ (insert-file-contents (expand-file-name "externals-list" dir))
+ (read (current-buffer))))
+
(defun archive--insert-repolinks (name srcdir _mainsrcfile url)
(when url
(insert (format "<dt>Home page</dt> <dd><a href=%S>%s</a></dd>\n"
url (archive--quote url)))
(when (string-match archive-default-url-re url)
(setq url nil)))
- (let* ((externals
- (with-temp-buffer
- (insert-file-contents
- (expand-file-name "../../../elpa/externals-list" srcdir))
- (read (current-buffer))))
+ (let* ((externals (archive--read-externals-list
+ (expand-file-name "../../../elpa" srcdir)))
(external (eq :external (nth 1 (assoc name externals))))
(git-sv "http://git.savannah.gnu.org/")
(urls (if external
@@ -787,9 +789,7 @@ If WITH-CORE is non-nil, it means we manage :core packages
as well."
(defun archive-add/remove/update-externals ()
"Remove non-package directories and fetch external packages."
- (let ((externals-list
- (with-current-buffer (find-file-noselect "externals-list")
- (read (buffer-string)))))
+ (let ((externals-list (archive--read-externals-list)))
(let ((with-core (archive--sync-emacs-repo)))
(archive--cleanup-packages externals-list with-core)
(pcase-dolist ((and definition `(,name ,kind ,_url)) externals-list)
- [elpa] elpa-admin f79a619 218/357: * packages/gnome-c-style/gnome-c-tests.el: Add copyright blurb, (continued)
- [elpa] elpa-admin f79a619 218/357: * packages/gnome-c-style/gnome-c-tests.el: Add copyright blurb, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 28819e8 192/357: Skip uninteresting elements, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 345dc39 189/357: * GNUmakefile: Use LC_ALL rather than LANG, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 368a212 219/357: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs/elpa, Stefan Monnier, 2020/12/10
- [elpa] elpa-admin 7edd6ff 205/357: Dereference symlinks when creating tarballs, Stefan Monnier, 2020/12/10
- [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 <=
- [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, 2020/12/10
- [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