[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
scratch/package-vc-fixes 2e007c62f3 14/48: Track 'default-directory' whi
From: |
Philip Kaludercic |
Subject: |
scratch/package-vc-fixes 2e007c62f3 14/48: Track 'default-directory' while updating source packages |
Date: |
Wed, 16 Nov 2022 04:50:00 -0500 (EST) |
branch: scratch/package-vc-fixes
commit 2e007c62f354a01c5e49c44f3e25d3b42260dea6
Author: Philip Kaludercic <philipk@posteo.net>
Commit: Philip Kaludercic <philipk@posteo.net>
Track 'default-directory' while updating source packages
* lisp/emacs-lisp/package-vc.el (package-vc-update): Add the source
directory to the identifier list, in case the remaining
'vc-do-command' arguments are all read-time constants.
---
lisp/emacs-lisp/package-vc.el | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el
index 93a96abb68..d2ee63da87 100644
--- a/lisp/emacs-lisp/package-vc.el
+++ b/lisp/emacs-lisp/package-vc.el
@@ -544,19 +544,22 @@ installed package."
;;
;; If there is a better way to do this, it should be done.
(letrec ((pkg-dir (package-desc-dir pkg-desc))
- (empty (make-symbol empty))
- (args (list empty empty empty))
+ (empty (make-symbol "empty"))
+ (args (list empty empty empty empty))
(vc-filter-command-function
(lambda (command file-or-list flags)
(setf (nth 0 args) command
(nth 1 args) file-or-list
- (nth 2 args) flags)
+ (nth 2 args) flags
+ (nth 3 args) default-directory)
(list command file-or-list flags)))
(post-upgrade
(lambda (command file-or-list flags)
(when (and (memq (nth 0 args) (list command empty))
(memq (nth 1 args) (list file-or-list empty))
- (memq (nth 2 args) (list flags empty)))
+ (memq (nth 2 args) (list flags empty))
+ (or (eq (nth 3 args) empty)
+ (file-equal-p (nth 3 args) default-directory)))
(with-demoted-errors "Failed to activate: %S"
(package-vc--unpack-1 pkg-desc pkg-dir))
(remove-hook 'vc-post-command-functions post-upgrade)))))
- scratch/package-vc-fixes d051b24c3c 09/48: Clarify 'package-vc--build-documentation' docstring, (continued)
- scratch/package-vc-fixes d051b24c3c 09/48: Clarify 'package-vc--build-documentation' docstring, Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes 7e15f35bac 19/48: Avoid using 'package-lisp-dir' in 'package-generate-autoloads', Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes 315a61bbc7 18/48: Remove unused variable in 'package-vc--unpack', Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes ff90ad5277 24/48: Fix indefinite loading of asynchronous downloads, Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes 92730e0a5e 25/48: Clarify 'package-vc-selected-packages' docstring, Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes 4b47dc81d6 37/48: Add missing elpa-package.eld to package test resources, Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes 9ca8236a03 33/48: * lisp/vc/vc.el (vc-default-last-change): Use 'vc-call', Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes 42b01caac1 39/48: Avoid updating non-source packages in 'package-vc-update-all', Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes bef3acf0f0 31/48: Explain that 'package-vc-install' doesn't remove tarball packages, Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes 58e2e8cced 44/48: ; * lisp/emacs-lisp/package-vc.el: Update TODO, Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes 2e007c62f3 14/48: Track 'default-directory' while updating source packages,
Philip Kaludercic <=
- scratch/package-vc-fixes 3046447102 22/48: ; Assert that 'package-lisp-dir' is used with real packages, Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes 78830856bc 28/48: Rename 'package-vc-refresh' to 'package-vc-rebuild', Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes 2024a01fdc 30/48: Mention package name when package is lacking VC data, Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes 6080b169f3 47/48: Avoid duplicate source packages in 'package-alist', Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes 9bbfdbba24 06/48: Mark 'package-vc-update' as interactive, Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes e8043ebc57 03/48: Rename '-ensure-packages' to -install-selected-packages', Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes 155c3673d7 13/48: Allow specifying a :lisp-dir for package descriptions, Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes 4b0a5e30b9 16/48: Fix type error in package-vc prompt function, Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes 7ee6f3e32d 20/48: Fix 'package-vc-install-selected-packages' recursive load, Philip Kaludercic, 2022/11/16
- scratch/package-vc-fixes 3dc2ec3fce 21/48: Make documentation building for source packages more robust, Philip Kaludercic, 2022/11/16