procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix last change in tramp-sh.el

Browse source 
* lisp/net/tramp-sh.el (tramp-do-copy-or-rename-file-directly):
Use "-R" rather than "-r" for recursive copy of directories.
This commit is contained in:
Michael Albinus 2018-06-25 16:25:41 +02:00
parent f43186fe28
commit 517dc0b135
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lisp/net/tramp-sh.el
View file

@ -2189,8 +2189,8 @@ the uid and gid from FILENAME."
(file-attributes filename))) (file-attributes filename)))
(file-modes (tramp-default-file-modes filename))) (file-modes (tramp-default-file-modes filename)))
(with-parsed-tramp-file-name (if t1 filename newname) nil (with-parsed-tramp-file-name (if t1 filename newname) nil
(let* ((cmd (cond ((and (eq op 'copy) preserve-uid-gid) "cp -f -r -p") (let* ((cmd (cond ((and (eq op 'copy) preserve-uid-gid) "cp -f -p")
((eq op 'copy) "cp -f -r") ((eq op 'copy) "cp -f")
((eq op 'rename) "mv -f") ((eq op 'rename) "mv -f")
(t (tramp-error (t (tramp-error
v 'file-error v 'file-error
@ -2200,6 +2200,8 @@ the uid and gid from FILENAME."
(localname2 (if t2 (file-remote-p newname 'localname) newname)) (localname2 (if t2 (file-remote-p newname 'localname) newname))
(prefix (file-remote-p (if t1 filename newname))) (prefix (file-remote-p (if t1 filename newname)))
cmd-result) cmd-result)
(when (and (eq op 'copy) (file-directory-p filename))
(setq cmd (concat cmd " -R")))
(cond (cond
;; Both files are on a remote host, with same user. ;; Both files are on a remote host, with same user.