From: Michael Albinus Date: Tue, 15 Dec 2020 11:50:50 +0000 (+0100) Subject: Revert last change in tramp-maybe-open-connection) X-Git-Tag: emacs-28.0.90~4696 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c8aad8cc11ccfda64a07cfc9675c6e6b07d552fa;p=emacs.git Revert last change in tramp-maybe-open-connection) * lisp/net/tramp-sh.el (tramp-maybe-open-connection): Revert last change, it causes trouble. --- diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index e9814cdadb9..f4a93c840cf 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -4960,9 +4960,10 @@ connection if a previous connection has died for some reason." (when (and (time-less-p 60 (time-since (tramp-get-connection-property p "last-cmd-time" 0))) - (process-live-p p) - (tramp-get-connection-property p "connected" nil)) - (unless (tramp-send-command-and-check vec "echo are you awake") + (process-live-p p)) + (tramp-send-command vec "echo are you awake" t t) + (unless (and (process-live-p p) + (tramp-wait-for-output p 10)) ;; The error will be caught locally. (tramp-error vec 'file-error "Awake did fail"))) (file-error