branch: elpa-admin
commit 2febc25ea69681f0932355cbe14f2cbcb34ac3a4
Author: Stefan Monnier <monn...@iro.umontreal.ca>
Commit: Stefan Monnier <monn...@iro.umontreal.ca>
* elpa-admin.el: Another tweak for `:manual-sync`
* elpa-admin.el (elpaa--batch-fetch-and): Don't bother fetching
packages that are `:manual-sync` either.
(elpaa--merge): Don't burp on symbols for package names.
---
elpa-admin.el | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/elpa-admin.el b/elpa-admin.el
index f4c8430e6c..770006cfdc 100644
--- a/elpa-admin.el
+++ b/elpa-admin.el
@@ -2691,7 +2691,7 @@ relative to elpa root."
default-directory)
nil)
(let* ((pkg (car pkg-spec))
- (wt (expand-file-name pkg "packages"))
+ (wt (expand-file-name (format "packages/%s" pkg)))
(merge-branch (format "elpa--merge/%s" pkg))
last-release)
;; When the upstream changes includes changes to `Version:'), try to
@@ -2771,14 +2771,12 @@ relative to elpa root."
(dolist (pkg pkgs)
(let* ((pkg-spec (elpaa--get-package-spec pkg specs)))
(cond
+ ((and all (elpaa--spec-get pkg-spec :manual-sync)) nil) ;Skip.
((or (eq condition ':)
(elpaa--spec-get pkg-spec condition))
;; (unless (file-directory-p (expand-file-name pkg "packages"))
;; (elpaa--worktree-sync pkg-spec))
- (elpaa--fetch pkg-spec
- (if (and all (elpaa--spec-get pkg-spec :manual-sync))
- #'ignore k)
- show-diverged)))))))
+ (elpaa--fetch pkg-spec k show-diverged)))))))
(defun elpaa-batch-fetch-and-show (&rest _)
(elpaa--batch-fetch-and #'ignore))
