procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Tramp shall not trap unrelated D-Bus errors

Browse source 
* lisp/net/tramp-gvfs.el (tramp-gvfs-dbus-event-vector): Declare.
(tramp-gvfs-file-name-handler): Let-bind it.
(tramp-gvfs-dbus-event-vector): Fix docstring.
(tramp-gvfs-maybe-open-connection): Do not set it globally.  (Bug#56162)
This commit is contained in:
Michael Albinus 2022-06-28 14:41:45 +02:00
parent a8e72eb0e2
commit 2eba8cad20
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
lisp/net/tramp-gvfs.el
View file

@ -841,6 +841,8 @@ Operations not mentioned here will be handled by the default Emacs primitives.")
(tramp-file-name-method (tramp-dissect-file-name filename)))) (tramp-file-name-method (tramp-dissect-file-name filename))))
(and (stringp method) (member method tramp-gvfs-methods))))) (and (stringp method) (member method tramp-gvfs-methods)))))
(defvar tramp-gvfs-dbus-event-vector)
;;;###tramp-autoload ;;;###tramp-autoload
(defun tramp-gvfs-file-name-handler (operation &rest args) (defun tramp-gvfs-file-name-handler (operation &rest args)
"Invoke the GVFS related OPERATION and ARGS. "Invoke the GVFS related OPERATION and ARGS.
@ -848,7 +850,11 @@ First arg specifies the OPERATION, second arg is a list of
arguments to pass to the OPERATION." arguments to pass to the OPERATION."
(unless tramp-gvfs-enabled (unless tramp-gvfs-enabled
(tramp-user-error nil "Package `tramp-gvfs' not supported")) (tramp-user-error nil "Package `tramp-gvfs' not supported"))
(if-let ((fn (assoc operation tramp-gvfs-file-name-handler-alist))) (if-let ((filename (apply #'tramp-file-name-for-operation operation args))
(tramp-gvfs-dbus-event-vector
(and (tramp-tramp-file-p filename)
(tramp-dissect-file-name filename)))
(fn (assoc operation tramp-gvfs-file-name-handler-alist)))
(save-match-data (apply (cdr fn) args)) (save-match-data (apply (cdr fn) args))
(tramp-run-real-handler operation args))) (tramp-run-real-handler operation args)))
@ -942,7 +948,8 @@ The call will be traced by Tramp with trace level 6."
(defvar tramp-gvfs-dbus-event-vector nil (defvar tramp-gvfs-dbus-event-vector nil
"Current Tramp file name to be used, as vector. "Current Tramp file name to be used, as vector.
It is needed when D-Bus signals or errors arrive, because there It is needed when D-Bus signals or errors arrive, because there
is no information where to trace the message.") is no information where to trace the message.
Globally, the value shall always be nil; it is bound where needed.")
(defun tramp-gvfs-dbus-event-error (event err) (defun tramp-gvfs-dbus-event-error (event err)
"Called when a D-Bus error message arrives, see `dbus-event-error-functions'." "Called when a D-Bus error message arrives, see `dbus-event-error-functions'."
@ -2121,10 +2128,6 @@ connection if a previous connection has died for some reason."
(unless (tramp-connectable-p vec) (unless (tramp-connectable-p vec)
(throw 'non-essential 'non-essential)) (throw 'non-essential 'non-essential))
;; We set the file name, in case there are incoming D-Bus signals or
;; D-Bus errors.
(setq tramp-gvfs-dbus-event-vector vec)
;; For password handling, we need a process bound to the connection ;; For password handling, we need a process bound to the connection
;; buffer. Therefore, we create a dummy process. Maybe there is a ;; buffer. Therefore, we create a dummy process. Maybe there is a
;; better solution? ;; better solution?