alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
nixpkgs/pkgs/applications/editors/emacs/tramp-detect-wrapped-gvfsd.patch

13 lines
499 B
Diff
Raw Normal View History

emacs: tramp: detect wrapped gvfsd-fuse daemon Tramp checks for a running `gvfsd-fuse` process to figure out whether to enable gvfs-based. Its `tramp-compat-process-running-p` function uses `/proc/<pid>/comm` to check for the name of running process(es). In Nix, the gvfsd processes are launched via wrappers and the name of `gvfsd-fuse` in `comm` in Linux is `.gvfsd-fuse-wra` (truncated to 15 characters) which means the process is not detected and `tramp-gvfs-enabled` ends up with `nil` even when gvfs is available. This patch adds `.gvfsd-fuse-wrapped` to the list of process names to check when determining the value of `tramp-gvfs-enabled`.
2019-01-10 16:06:54 +00:00
diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el
emacs: 26.3 -> 27.1
2020-08-11 12:41:31 +01:00
index 34a234c..b5a471c 100644
emacs: tramp: detect wrapped gvfsd-fuse daemon Tramp checks for a running `gvfsd-fuse` process to figure out whether to enable gvfs-based. Its `tramp-compat-process-running-p` function uses `/proc/<pid>/comm` to check for the name of running process(es). In Nix, the gvfsd processes are launched via wrappers and the name of `gvfsd-fuse` in `comm` in Linux is `.gvfsd-fuse-wra` (truncated to 15 characters) which means the process is not detected and `tramp-gvfs-enabled` ends up with `nil` even when gvfs is available. This patch adds `.gvfsd-fuse-wrapped` to the list of process names to check when determining the value of `tramp-gvfs-enabled`.
2019-01-10 16:06:54 +00:00
--- a/lisp/net/tramp-gvfs.el
+++ b/lisp/net/tramp-gvfs.el
emacs: 26.3 -> 27.1
2020-08-11 12:41:31 +01:00
@@ -122,6 +122,7 @@
emacs: tramp: detect wrapped gvfsd-fuse daemon Tramp checks for a running `gvfsd-fuse` process to figure out whether to enable gvfs-based. Its `tramp-compat-process-running-p` function uses `/proc/<pid>/comm` to check for the name of running process(es). In Nix, the gvfsd processes are launched via wrappers and the name of `gvfsd-fuse` in `comm` in Linux is `.gvfsd-fuse-wra` (truncated to 15 characters) which means the process is not detected and `tramp-gvfs-enabled` ends up with `nil` even when gvfs is available. This patch adds `.gvfsd-fuse-wrapped` to the list of process names to check when determining the value of `tramp-gvfs-enabled`.
2019-01-10 16:06:54 +00:00
(tramp-compat-funcall 'dbus-get-unique-name :system)
(tramp-compat-funcall 'dbus-get-unique-name :session)
emacs: 26.3 -> 27.1
2020-08-11 12:41:31 +01:00
(or (tramp-compat-process-running-p "gvfs-fuse-daemon")
+ (tramp-compat-process-running-p ".gvfsd-fuse-wrapped")
emacs: tramp: detect wrapped gvfsd-fuse daemon Tramp checks for a running `gvfsd-fuse` process to figure out whether to enable gvfs-based. Its `tramp-compat-process-running-p` function uses `/proc/<pid>/comm` to check for the name of running process(es). In Nix, the gvfsd processes are launched via wrappers and the name of `gvfsd-fuse` in `comm` in Linux is `.gvfsd-fuse-wra` (truncated to 15 characters) which means the process is not detected and `tramp-gvfs-enabled` ends up with `nil` even when gvfs is available. This patch adds `.gvfsd-fuse-wrapped` to the list of process names to check when determining the value of `tramp-gvfs-enabled`.
2019-01-10 16:06:54 +00:00
(tramp-compat-process-running-p "gvfsd-fuse"))))
"Non-nil when GVFS is available.")
Copy permalink