[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa-admin 14797ea 319/439: * admin/archive-contents.el: Adjust
From: |
Philip Kaludercic |
Subject: |
[nongnu] elpa-admin 14797ea 319/439: * admin/archive-contents.el: Adjust last change |
Date: |
Sun, 17 Oct 2021 15:48:28 -0400 (EDT) |
branch: elpa-admin
commit 14797ea330786f9bc2006bab2fb9ec6adc84b61c
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Commit: Stefan Monnier <monnier@iro.umontreal.ca>
* admin/archive-contents.el: Adjust last change
(archive--metadata): Fix plist<->alist confusion.
(archive--external-package-sync): Don't break if previous clone
was interrupted.
(archive--core-package-link-file): Don't drop a trailing / from the newname.
(archive--core-package-sync): Ensure default-directory has a trailing slash.
---
admin/archive-contents.el | 34 +++++++++++++++++++++-------------
1 file changed, 21 insertions(+), 13 deletions(-)
diff --git a/admin/archive-contents.el b/admin/archive-contents.el
index 914c68f..bebf5e4 100644
--- a/admin/archive-contents.el
+++ b/admin/archive-contents.el
@@ -145,7 +145,9 @@ Currently only refreshes the ChangeLog files."
(when (file-directory-p pkg)
(archive--make-changelog pkg (expand-file-name "packages/"
srcdir)))
- (error (message "Error: %S" v)))))
+ (error (message
+ "Error in archive-prepare-packages for package %S:\n %S"
+ pkg v)))))
(write-region new-revno nil wit nil 'quiet)
;; Also update the ChangeLog of external packages.
(let ((default-directory (expand-file-name "packages/")))
@@ -206,22 +208,22 @@ PKG is the name of the package and DIR is the directory
where it is."
(extras (package-desc-extras pkg-desc))
(version (package-desc-version pkg-desc))
(keywords (lm-keywords-list))
- (_ (archive--version-to-list version)) ; Sanity check!
+ ;; (_ (archive--version-to-list version)) ; Sanity check!
(pt (lm-header "package-type"))
(simple (if pt (equal pt "simple") (= (length files) 1)))
- (found-url (plist-get extras :url))
- (found-keywords (plist-get extras :keywords)))
+ (found-url (alist-get :url extras))
+ (found-keywords (alist-get :keywords extras)))
(when (and keywords (not found-keywords))
;; Using an old package-buffer-info which doesn't include
;; keywords. Fix it by hand.
- (setq extras (plist-put extras :keywords keywords)))
+ (push (cons :keywords keywords) extras))
(unless found-url
;; Provide a good default URL.
- (setq extras (plist-put extras :url
- (format archive-default-url-format pkg))))
-
- (list simple version (package-desc-summary pkg-desc)
+ (push (cons :url (format archive-default-url-format pkg)) extras))
+ (list simple
+ (package-version-join version)
+ (package-desc-summary pkg-desc)
(package-desc-reqs pkg-desc)
extras))))
(t
@@ -751,7 +753,7 @@ If WITH-CORE is non-nil, it means we manage :core packages
as well."
(with-temp-buffer
(if (archive--use-worktree-p)
(archive-call t "git" "worktree" "add"
- "-b" branch
+ "-B" branch
name (concat "origin/" branch))
(archive-call t "git" "clone"
"--reference" ".." "--single-branch"
@@ -772,7 +774,10 @@ If WITH-CORE is non-nil, it means we manage :core packages
as well."
"Link file from SOURCE to DEST ensuring subdirectories."
(unless (string-match-p exclude-regexp source)
(let* ((absolute-package-file-name
- (expand-file-name dest package-root))
+ (if (equal "" dest)
+ ;; Calling expand-file-name would remove the trailing / !
+ package-root
+ (expand-file-name dest package-root)))
(absolute-core-file-name
(expand-file-name source emacs-repo-root))
(directory (file-name-directory absolute-package-file-name)))
@@ -780,10 +785,12 @@ If WITH-CORE is non-nil, it means we manage :core
packages as well."
(setq directory (file-name-quote directory)))
(unless (file-directory-p directory)
(make-directory directory t))
- (condition-case nil
+ (condition-case err
(make-symbolic-link absolute-core-file-name
absolute-package-file-name t)
(file-error
+ (message "Error: can't symlink to %S from %S:\n %S"
+ absolute-core-file-name absolute-package-file-name err)
(copy-file absolute-core-file-name
(if (file-directory-p absolute-package-file-name)
(file-name-as-directory absolute-package-file-name)
@@ -823,7 +830,8 @@ If WITH-CORE is non-nil, it means we manage :core packages
as well."
(pcase-let*
((`(,name . (:core ,file-patterns :excludes ,excludes)) definition)
(emacs-repo-root (expand-file-name "emacs"))
- (package-root (expand-file-name name "packages"))
+ (package-root (file-name-as-directory
+ (expand-file-name name "packages")))
(default-directory package-root)
(exclude-regexp
(mapconcat #'identity
- [nongnu] elpa-admin a216465 299/439: * admin/archive-contents.el (archive--insert-repolinks): Whoops, (continued)
- [nongnu] elpa-admin a216465 299/439: * admin/archive-contents.el (archive--insert-repolinks): Whoops, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 38e81a8 300/439: * README: Recommend "externals" and add some recommendations, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 655d2e7 305/439: Update packages/ack from upstream, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin f25cda3 303/439: * GNUmakefile (%.elc): Use load-prefer-newer, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin f85cb8d 302/439: * README (PACKAGES/Externals): Clarify use, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin a71a25a 306/439: Update packages/darkroom from upstream, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 0c6fbe0 307/439: Update packages/ack from upstream, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin c943660 310/439: Merge commit '98405112baa5ce2a118d1c65184c005d8ddaa1a9', Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 973ee9d 314/439: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs/elpa, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 9822a67 315/439: README: Mention that the copyright in ELPA is with the FSF, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 14797ea 319/439: * admin/archive-contents.el: Adjust last change,
Philip Kaludercic <=
- [nongnu] elpa-admin 9c8cf14 320/439: * admin/archive-contents.el (archive-refresh-pkg-file): Resurrect., Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 4fc4d47 321/439: Merge commit '5b562e4ddfc449cd61c82ef7646a6c501b913b6c', Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin b69dfb7 324/439: Merge commit '8dbcc8e07c462777378cc859eced622ec9b0fc4d', Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 5ef13b0 326/439: Merge commit '33afdb46e1cd61251736816d965495525b36c9cd', Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin f9ce2f8 328/439: Merge commit 'b2c449c0d5aad67eeee9857e7fd7710f985084ec', Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 7be6e5f 330/439: ; Update copyright year, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin a186f57 335/439: * README: Convert to org-mode and prepare for export., Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin cff34fa 336/439: Support generating readme.html from README, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin cdef4ce 338/439: * admin/archive-contents.el: Add preliminary support for the NonGNU archive, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 0f8fca3 360/439: * elpa-admin.el: Add support for sending out release announcements, Philip Kaludercic, 2021/10/17