From e609bf59ebb23c10f0e9f56df38f64be37de06dd Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Fri, 12 Mar 2021 16:09:42 +0100 Subject: [PATCH] Tramp sshfs fixes * doc/misc/tramp.texi (FUSE setup): Fix typo. * lisp/net/tramp-sshfs.el (tramp-sshfs-handle-set-file-modes): Use `tramp-compat-set-file-modes'. * test/lisp/net/tramp-tests.el (tramp-test43-asynchronous-requests): Don't run for tramp-sshfs. --- doc/misc/tramp.texi | 2 +- lisp/net/tramp-sshfs.el | 3 ++- test/lisp/net/tramp-tests.el | 4 +++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi index e5e15cdaa5d..7ae562244e2 100644 --- a/doc/misc/tramp.texi +++ b/doc/misc/tramp.texi @@ -2653,7 +2653,7 @@ The method @option{sshfs} declares the mount arguments in the variable a list of list of strings, and can be overwritten by the connection property @t{"mount-args"}, @xref{Predefined connection information}. -Additionally. it declares also the arguments for running remote +Additionally, it declares also the arguments for running remote processes, using the @command{ssh} command. These don't need to be changed. diff --git a/lisp/net/tramp-sshfs.el b/lisp/net/tramp-sshfs.el index ce9412c0bea..2a00d5ce678 100644 --- a/lisp/net/tramp-sshfs.el +++ b/lisp/net/tramp-sshfs.el @@ -276,7 +276,8 @@ arguments to pass to the OPERATION." (with-parsed-tramp-file-name filename nil (unless (and (eq flag 'nofollow) (file-symlink-p filename)) (tramp-flush-file-properties v localname) - (set-file-modes (tramp-fuse-local-file-name filename) mode flag)))) + (tramp-compat-set-file-modes + (tramp-fuse-local-file-name filename) mode flag)))) (defun tramp-sshfs-handle-write-region (start end filename &optional append visit lockname mustbenew) diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el index 6565919c771..be428fc2a64 100644 --- a/test/lisp/net/tramp-tests.el +++ b/test/lisp/net/tramp-tests.el @@ -6380,7 +6380,7 @@ process sentinels. They shall not disturb each other." ;; Prior Emacs 27, `shell-file-name' was hard coded as "/bin/sh" for ;; remote processes in Emacs. That doesn't work for tramp-adb.el. (skip-unless (or (and (tramp--test-adb-p) (tramp--test-emacs27-p)) - (tramp--test-sh-p) (tramp--test-sshfs-p))) + (tramp--test-sh-p))) (skip-unless (not (tramp--test-crypt-p))) (skip-unless (not (tramp--test-docker-p))) (skip-unless (not (tramp--test-windows-nt-p))) @@ -6767,6 +6767,8 @@ If INTERACTIVE is non-nil, the tests are run interactively." ;; * Fix `tramp-test06-directory-file-name' for `ftp'. ;; * Implement `tramp-test31-interrupt-process' for `adb', `sshfs' and ;; for direct async processes. +;; * Check, why direct async processes do not work for +;; `tramp-test43-asynchronous-requests'. (provide 'tramp-tests) -- 2.39.2