From: Michael Albinus <michael.albinus@gmx.de>
Date: Wed, 20 Feb 2019 14:59:18 +0000 (+0100)
Subject: Improve connection hand-shaking in tramp-adb.el
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~19^2~3957
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=29db0dd31172ecbc73abdb1895214818be5cbf26;p=emacs.git

Improve connection hand-shaking in tramp-adb.el

* lisp/net/tramp-adb.el (tramp-adb-maybe-open-connection):
Send an additional RET.
---

diff --git a/lisp/net/tramp-adb.el b/lisp/net/tramp-adb.el
index f3ba7f2a1eb..1ba8d6274e5 100644
--- a/lisp/net/tramp-adb.el
+++ b/lisp/net/tramp-adb.el
@@ -1314,7 +1314,10 @@ connection if a previous connection has died for some reason."
 				      (current-time-string)))))
 	    (tramp-message
 	     vec 6 "%s" (mapconcat 'identity (process-command p) " "))
-	    ;; Wait for initial prompt.
+	    ;; Wait for initial prompt.  On some devices, it needs an
+	    ;; initial RET, in order to get it.
+            (sleep-for 0.1)
+	    (tramp-send-string vec tramp-rsh-end-of-line)
 	    (tramp-adb-wait-for-output p 30)
 	    (unless (process-live-p p)
 	      (tramp-error vec 'file-error "Terminated!"))