From: Michael Albinus <michael.albinus@gmx.de>
Date: Wed, 4 Jan 2023 17:12:02 +0000 (+0100)
Subject: Fix bug in Tramp multi-hop
X-Git-Tag: emacs-29.0.90~839
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c18878ee0a2e16d294bb1b55d233469c604a83ea;p=emacs.git

Fix bug in Tramp multi-hop

* lisp/net/tramp.el (tramp-compute-multi-hops): Make check for
host name more robust.  (Bug#60499)
---

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'.")
 	      (or
 	       ;; The host name is used for the remote shell command.
 	       (member
-		'("%h") (tramp-get-method-parameter item 'tramp-login-args))
+		"%h" (tramp-compat-flatten-tree
+		      (tramp-get-method-parameter item 'tramp-login-args)))
 	       ;; The host name must match previous hop.
 	       (string-match-p previous-host host))
 	    (setq tramp-default-proxies-alist saved-tdpa)