diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2022-09-19 11:39:29 +0200 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2022-09-19 11:39:29 +0200 |
| commit | 0e5eb6ec8ce99c423bbafc6e8e3292d4459050d1 (patch) | |
| tree | 5abfaddcc73aea321567bfe3b434b7cb90c1e974 | |
| parent | 899055eef5b212d63e352ada2ac917d13c033a59 (diff) | |
| download | emacs-0e5eb6ec8ce99c423bbafc6e8e3292d4459050d1.tar.gz | |
Revert change in Tramp inotifywait
* lisp/net/tramp-sh.el (tramp-sh-handle-file-notify-add-watch):
Revert use of "-P", it doesn't exist in older inotifywait versions.
* test/lisp/filenotify-tests.el: Deactivate instrumentation.
| -rw-r--r-- | lisp/net/tramp-sh.el | 3 | ||||
| -rw-r--r-- | test/lisp/filenotify-tests.el | 13 |
2 files changed, 8 insertions, 8 deletions
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 2052fa5a732..1d0d0f8b1ba 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -3814,7 +3814,8 @@ Fall back to normal file name handler if no Tramp handler exists." (concat "create,modify,move,moved_from,moved_to,move_self," "delete,delete_self,ignored")) ((memq 'attribute-change flags) "attrib,ignored")) - sequence `(,command "-mPq" "-e" ,events ,localname) + ;; "-P" has been added to version 3.21, so we cannot assume it yet. + sequence `(,command "-mq" "-e" ,events ,localname) ;; Make events a list of symbols. events (mapcar diff --git a/test/lisp/filenotify-tests.el b/test/lisp/filenotify-tests.el index 1e36117825e..d82e2dae7aa 100644 --- a/test/lisp/filenotify-tests.el +++ b/test/lisp/filenotify-tests.el @@ -137,11 +137,10 @@ Return nil when any other file notification watch is still active." (defun file-notify--test-cleanup () "Cleanup after a test." - (when (getenv "EMACS_EMBA_CI") - (dolist (buf (tramp-list-tramp-buffers)) - (message ";; %s\n%s" buf (tramp-get-buffer-string buf)) - (kill-buffer buf))) - + ;; (when (getenv "EMACS_EMBA_CI") + ;; (dolist (buf (tramp-list-tramp-buffers)) + ;; (message ";; %s\n%s" buf (tramp-get-buffer-string buf)) + ;; (kill-buffer buf))) (file-notify-rm-all-watches) (ignore-errors @@ -178,8 +177,8 @@ Return nil when any other file notification watch is still active." (setq file-notify-debug nil password-cache-expiry nil - tramp-verbose (if (getenv "EMACS_EMBA_CI") 10 0) - + ;; tramp-verbose (if (getenv "EMACS_EMBA_CI") 10 0) + tramp-verbose 0 ;; When the remote user id is 0, Tramp refuses unsafe temporary files. tramp-allow-unsafe-temporary-files (or tramp-allow-unsafe-temporary-files noninteractive)) |