[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa-admin c84575d 411/439: * elpa-admin.el (elpaa--get-release
From: |
Philip Kaludercic |
Subject: |
[nongnu] elpa-admin c84575d 411/439: * elpa-admin.el (elpaa--get-release-revision): Fix code for :core pkgs |
Date: |
Sun, 17 Oct 2021 15:48:47 -0400 (EDT) |
branch: elpa-admin
commit c84575d8acd95765497de3de1b69998cad533f56
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Commit: Stefan Monnier <monnier@iro.umontreal.ca>
* elpa-admin.el (elpaa--get-release-revision): Fix code for :core pkgs
(elpaa--select-revision): Be more forgiving.
---
elpa-admin.el | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/elpa-admin.el b/elpa-admin.el
index 5cb3d26..66614c8 100644
--- a/elpa-admin.el
+++ b/elpa-admin.el
@@ -163,7 +163,13 @@ commit which modified the \"Version:\" pseudo header."
(not (member vers (car version-map))))
(pop version-map))
(or (nth 2 (car version-map))
- (let* ((default-directory (elpaa--dirname dir))
+ ;; When the mainfile is a symlink (e.g. for :core packages), run Git
+ ;; in the directory that holds the actual file, otherwise Git won't
+ ;; know what file we're talking about.
+ (let* ((mainfile (file-truename
+ (expand-file-name (elpaa--main-file pkg-spec)
+ (elpaa--dirname dir))))
+ (default-directory (file-name-directory mainfile))
(release-rev
(with-temp-buffer
(if (equal 0 ;Don't signal an error if call errors out.
@@ -172,7 +178,7 @@ commit which modified the \"Version:\" pseudo header."
"git" "log" "-n1" "--oneline" "--no-patch"
"--pretty=format:%H"
"-L" (concat "/^;;* *\\(Package-\\)\\?Version:/,+1:"
- (elpaa--main-file pkg-spec))))
+ (file-name-nondirectory mainfile))))
(buffer-string)
(cons 'error (buffer-string))))))
(if (stringp release-rev)
@@ -246,7 +252,8 @@ Do it without leaving the current branch."
(expand-file-name (elpaa--main-file pkg-spec) dir)))
(default-directory (file-name-directory ftn)))
(vc-working-revision ftn))))
- (if (equal rev cur-rev)
+ ;; Don't fail in case `rev' is not known.
+ (if (or (not rev) (equal rev cur-rev))
(elpaa--message "Current revision is already desired revision!")
(with-temp-buffer
(let ((default-directory (elpaa--dirname dir)))
- [nongnu] elpa-admin 21cddee 407/439: * elpa-admin.el (elpaa--get-devel-version): Fix regexp substitution, (continued)
- [nongnu] elpa-admin 21cddee 407/439: * elpa-admin.el (elpaa--get-devel-version): Fix regexp substitution, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin ee591c2 379/439: * elpa-admin.el (elpaa--release-email): Cc maintainer, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin d19a5b8 341/439: * README.org: New file, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 5eab162 377/439: * elpa-admin.el: Give read access to Git in `:make`, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 040972d 342/439: * README.org: Describe how to build the archive and add a package, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 6dcc26f 378/439: * elpa-admin.el (elpaa--make): Fix last change, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 26d341c 391/439: * elpa-admin.el (elpaa--make): Add support for non-make command, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin fd06277 384/439: * elpa-admin.el (elpaa--core-package-sync): Don't presume shape of plist, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin f3fd8c5 387/439: * GNUmakefile (%.tar): New target, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 221c427 350/439: * admin/archive-contents.el: Improve handling of snapshot version numbers, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin c84575d 411/439: * elpa-admin.el (elpaa--get-release-revision): Fix code for :core pkgs,
Philip Kaludercic <=
- [nongnu] elpa-admin e3ca730 420/439: Support LibreJS, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 9e01d93 406/439: * elpa-admin.el (elpaa--prune-old-tarballs): Return resulting oldtarballs, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin fae2e2e 412/439: * elpa-admin.el (elpaa--prune-old-tarballs): Fix computation of .sig name, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 0783750 417/439: * elpa-admin.el (elpaa--sandbox-extra-ro-dirs): New var, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin d10026f 419/439: * elpa-admin.el: Preserve release tarballs at least 2 years, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 97ebbd5 405/439: * elpa-admin.el (elpaa--prune-old-tarballs): "(Re)move" the non-kept files, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 8ed7b88 354/439: Rename vars and functions with `elpaa-` prefix, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin d8903b6 358/439: * elpa-admin.el: Add some of the support needed to build Org packages, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin 7e5b75b 359/439: * elpa-admin.el: Add support for checking copyright notices, Philip Kaludercic, 2021/10/17
- [nongnu] elpa-admin c26df96 392/439: * elpa-admin.el: Allow `:doc` to specify several doc files, Philip Kaludercic, 2021/10/17