aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2019-02-20 15:59:18 +0100
committerMichael Albinus2019-02-20 15:59:18 +0100
commit29db0dd31172ecbc73abdb1895214818be5cbf26 (patch)
treec6455e0f1338c977e1e7ddec4598573ad66c74b6
parent74240f231266ec9350116772d6834b90cb52f09d (diff)
downloademacs-29db0dd31172ecbc73abdb1895214818be5cbf26.tar.gz
emacs-29db0dd31172ecbc73abdb1895214818be5cbf26.zip
Improve connection hand-shaking in tramp-adb.el
* lisp/net/tramp-adb.el (tramp-adb-maybe-open-connection): Send an additional RET.
-rw-r--r--lisp/net/tramp-adb.el5
1 files changed, 4 insertions, 1 deletions
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."
1314 (current-time-string))))) 1314 (current-time-string)))))
1315 (tramp-message 1315 (tramp-message
1316 vec 6 "%s" (mapconcat 'identity (process-command p) " ")) 1316 vec 6 "%s" (mapconcat 'identity (process-command p) " "))
1317 ;; Wait for initial prompt. 1317 ;; Wait for initial prompt. On some devices, it needs an
1318 ;; initial RET, in order to get it.
1319 (sleep-for 0.1)
1320 (tramp-send-string vec tramp-rsh-end-of-line)
1318 (tramp-adb-wait-for-output p 30) 1321 (tramp-adb-wait-for-output p 30)
1319 (unless (process-live-p p) 1322 (unless (process-live-p p)
1320 (tramp-error vec 'file-error "Terminated!")) 1323 (tramp-error vec 'file-error "Terminated!"))