mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-20 18:17:20 +00:00
Code Issues Releases Activity

Revert change in Tramp inotifywait

Browse Source 
* 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.
This commit is contained in:
Michael Albinus 2022-09-19 11:39:29 +02:00
parent 899055eef5
commit 0e5eb6ec8c
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lisp/net/tramp-sh.el
View File

@ -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

13
test/lisp/filenotify-tests.el
View File

@ -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))