Commit f42efeb5 authored by Michael Albinus's avatar Michael Albinus

* net/tramp-sh.el (tramp-sh-handle-file-attributes): Handle the

case when the scripts fail.  Use `tramp-do-file-attributes-with-ls'
then.
(tramp-do-copy-or-rename-file-out-of-band): Do not check any
longer, whether`executable-find' is bound.

* net/tramp-smb.el (tramp-smb-handle-copy-file): Fix docstring.
parent 54a8f337
2011-04-14 Michael Albinus <michael.albinus@gmx.de>
* net/tramp-sh.el (tramp-sh-handle-file-attributes): Handle the
case when the scripts fail. Use `tramp-do-file-attributes-with-ls'
then.
(tramp-do-copy-or-rename-file-out-of-band): Do not check any
longer, whether`executable-find' is bound.
* net/tramp-smb.el (tramp-smb-handle-copy-file): Fix docstring.
2011-04-14 Stefan Monnier <monnier@iro.umontreal.ca>
* minibuffer.el (completion-in-region-mode-predicate)
......
......@@ -1145,13 +1145,15 @@ target of the symlink differ."
(save-excursion
(tramp-convert-file-attributes
v
(cond
((tramp-get-remote-stat v)
(tramp-do-file-attributes-with-stat v localname id-format))
((tramp-get-remote-perl v)
(tramp-do-file-attributes-with-perl v localname id-format))
(t
(tramp-do-file-attributes-with-ls v localname id-format)))))))))
(or
(cond
((tramp-get-remote-stat v)
(tramp-do-file-attributes-with-stat v localname id-format))
((tramp-get-remote-perl v)
(tramp-do-file-attributes-with-perl v localname id-format))
(t nil))
;; The scripts could fail, for example with huge file size.
(tramp-do-file-attributes-with-ls v localname id-format))))))))
(defun tramp-do-file-attributes-with-ls (vec localname &optional id-format)
"Implement `file-attributes' for Tramp files using the ls(1) command."
......@@ -2296,10 +2298,9 @@ The method used must be an out-of-band method."
(tramp-get-method-parameter method 'tramp-copy-env))))
;; Check for program.
(when (and (fboundp 'executable-find)
(not (let ((default-directory
(tramp-compat-temporary-file-directory)))
(executable-find copy-program))))
(unless (let ((default-directory
(tramp-compat-temporary-file-directory)))
(executable-find copy-program))
(tramp-error
v 'file-error "Cannot find copy program: %s" copy-program))
......
......@@ -339,7 +339,7 @@ pass to the OPERATION."
preserve-uid-gid preserve-selinux-context)
"Like `copy-file' for Tramp files.
KEEP-DATE is not handled in case NEWNAME resides on an SMB server.
PRESERVE-UID-GID is completely ignored."
PRESERVE-UID-GID and PRESERVE-SELINUX-CONTEXT are completely ignored."
(setq filename (expand-file-name filename)
newname (expand-file-name newname))
(with-progress-reporter
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment