aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2023-01-04 18:12:02 +0100
committerMichael Albinus2023-01-04 18:12:02 +0100
commitc18878ee0a2e16d294bb1b55d233469c604a83ea (patch)
treed6ea5f038cf8847358b8473dc9683b930bc126cc
parent7eed8e050a9c580cc5770508d70b0139c4ac75a7 (diff)
downloademacs-c18878ee0a2e16d294bb1b55d233469c604a83ea.tar.gz
emacs-c18878ee0a2e16d294bb1b55d233469c604a83ea.zip
Fix bug in Tramp multi-hop
* lisp/net/tramp.el (tramp-compute-multi-hops): Make check for host name more robust. (Bug#60499)
-rw-r--r--lisp/net/tramp.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 61a606c3383..f0b17ef3934 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -4694,7 +4694,8 @@ Do not set it manually, it is used buffer-local in `tramp-get-lock-pid'.")
4694 (or 4694 (or
4695 ;; The host name is used for the remote shell command. 4695 ;; The host name is used for the remote shell command.
4696 (member 4696 (member
4697 '("%h") (tramp-get-method-parameter item 'tramp-login-args)) 4697 "%h" (tramp-compat-flatten-tree
4698 (tramp-get-method-parameter item 'tramp-login-args)))
4698 ;; The host name must match previous hop. 4699 ;; The host name must match previous hop.
4699 (string-match-p previous-host host)) 4700 (string-match-p previous-host host))
4700 (setq tramp-default-proxies-alist saved-tdpa) 4701 (setq tramp-default-proxies-alist saved-tdpa)