* 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.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0fd851c544bae9690cf845a968f022d951b748dd..bde1f1174c9dc25eef39cf67fec382e40252c471 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+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)

diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index ec5c46b2897b6c58289a03f121a8a6101ec1c19f..cb4aca12edbe5ccd66ca28dc69861fc4836ffdf5 100644 (file)
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -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))
 

diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el
index 7e1b0f5b8e9824c1a9b96c61facc03fa5e68e557..36477f7b43971f6fdfcffd01fe214763fba4dd31 100644 (file)
--- a/lisp/net/tramp-smb.el
+++ b/lisp/net/tramp-smb.el
@@ -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