From: Michael Albinus <michael.albinus@gmx.de>
Date: Sun, 21 Jun 2015 18:36:14 +0000 (+0200)
Subject: Improve error handling in tramp-adb.el
X-Git-Tag: emacs-25.0.90~1688
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8d4f1e3bd742278d6a3d4c42811845b860d0d104;p=emacs.git

Improve error handling in tramp-adb.el

* lisp/net/tramp-adb.el (tramp-adb-handle-file-local-copy):
Improve error handling.
---

diff --git a/lisp/net/tramp-adb.el b/lisp/net/tramp-adb.el
index 7c509e1d098..63059218579 100644
--- a/lisp/net/tramp-adb.el
+++ b/lisp/net/tramp-adb.el
@@ -575,8 +575,10 @@ Emacs dired can't find files."
     (let ((tmpfile (tramp-compat-make-temp-file filename)))
       (with-tramp-progress-reporter
 	  v 3 (format "Fetching %s to tmp file %s" filename tmpfile)
-	(when (tramp-adb-execute-adb-command v "pull" localname tmpfile)
-	  (delete-file tmpfile)
+	;; "adb pull ..." does not always return an error code.
+	(when (or (tramp-adb-execute-adb-command v "pull" localname tmpfile)
+		  (not (file-exists-p tmpfile)))
+	  (ignore-errors (delete-file tmpfile))
 	  (tramp-error
 	   v 'file-error "Cannot make local copy of file `%s'" filename))
 	(set-file-modes