diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2014-02-27 12:59:04 +0100 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2014-02-27 12:59:04 +0100 |
| commit | c22c16140eaa4cf391060360d36ab498fa57fdcb (patch) | |
| tree | cf061ac030cffb55a7b68ec18b9f5c9228e54937 /lisp/net/tramp.el | |
| parent | 915f4bce4038c3aeb9caf4602890e18f6236dc3f (diff) | |
| download | emacs-c22c16140eaa4cf391060360d36ab498fa57fdcb.tar.gz | |
Tramp adb fixes, found during test campaign.
* net/tramp.el (tramp-call-process): Improve trace message.
(tramp-handle-insert-file-contents): Trace error case.
* net/tramp-adb.el (tramp-adb-file-name-handler-alist)
<insert-directory>: Use `tramp-handle-insert-directory'.
(tramp-adb-handle-insert-directory): Remove function.
(tramp-adb-send-command-and-check): New defun, replacing
`tramp-adb-command-exit-status'. Change all callees.
(tramp-adb-handle-file-attributes)
(tramp-adb-handle-directory-files-and-attributes): Use it.
(tramp-adb-ls-output-name-less-p): Use
`directory-listing-before-filename-regexp'.
(tramp-adb-handle-delete-directory): Flush also file properties of
the truename of directory.
(tramp-adb-handle-file-name-all-completions): Add "./" and "../".
(tramp-adb-handle-file-local-copy): Make the local copy readable.
(tramp-adb-handle-write-region): Implement APPEND.
(tramp-adb-handle-rename-file): Make it more robust. Flush file
properties correctly.
(tramp-adb-maybe-open-connection): Set `tramp-current-*'
variables. Check for connected devices only when needed.
Diffstat (limited to 'lisp/net/tramp.el')
| -rw-r--r-- | lisp/net/tramp.el | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 581aaa40c99..7d88869a0d1 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -3050,10 +3050,13 @@ User is always nil." v 3 (format "Inserting `%s'" filename) (unwind-protect (if (not (file-exists-p filename)) - ;; We don't raise a Tramp error, because it might be - ;; suppressed, like in `find-file-noselect-1'. - (signal 'file-error - (list "File not found on remote host" filename)) + (progn + ;; We don't raise a Tramp error, because it might be + ;; suppressed, like in `find-file-noselect-1'. + (tramp-message + v 1 "File not `%s' found on remote host" filename) + (signal 'file-error + (list "File not found on remote host" filename))) (if (and (tramp-local-host-p v) (let (file-name-handler-alist) @@ -4082,7 +4085,7 @@ Lisp error raised when PROGRAM is nil is trapped also, returning 1. Furthermore, traces are written with verbosity of 6." (tramp-message (vector tramp-current-method tramp-current-user tramp-current-host nil nil) - 6 "%s %s %s" program infile args) + 6 "`%s %s' %s" program (mapconcat 'identity args " ") infile) (if (executable-find program) (apply 'call-process program infile destination display args) 1)) |