Commit 5ab38c3c authored by Michael Albinus's avatar Michael Albinus
Browse files

* tramp.el (tramp-do-copy-or-rename-file-directly): Overwrite

always the tmpfile.  (Bug#2962).
parent b86c2eb9
2009-04-12 Michael Albinus <michael.albinus@gmx.de>
* tramp.el (tramp-do-copy-or-rename-file-directly): Overwrite
always the tmpfile. (Bug#2962).
2009-04-11 Chong Yidong <cyd@stupidchicken.com> 2009-04-11 Chong Yidong <cyd@stupidchicken.com>
   
* files.el (dir-locals-directory-cache): Change format to include * files.el (dir-locals-directory-cache): Change format to include
......
...@@ -3255,8 +3255,8 @@ the uid and gid from FILENAME." ...@@ -3255,8 +3255,8 @@ the uid and gid from FILENAME."
;; We can do it directly with `tramp-send-command' ;; We can do it directly with `tramp-send-command'
((let (file-name-handler-alist) ((let (file-name-handler-alist)
(and (file-readable-p (concat prefix localname1)) (and (file-readable-p (concat prefix localname1))
(file-writable-p (file-writable-p
(file-name-directory (concat prefix localname2))))) (file-name-directory (concat prefix localname2)))))
(tramp-do-copy-or-rename-file-directly (tramp-do-copy-or-rename-file-directly
op (concat prefix localname1) (concat prefix localname2) op (concat prefix localname1) (concat prefix localname2)
ok-if-already-exists keep-date t) ok-if-already-exists keep-date t)
...@@ -3287,11 +3287,11 @@ the uid and gid from FILENAME." ...@@ -3287,11 +3287,11 @@ the uid and gid from FILENAME."
(t2 (t2
(if (eq op 'copy) (if (eq op 'copy)
(tramp-compat-copy-file (tramp-compat-copy-file
localname1 tmpfile ok-if-already-exists localname1 tmpfile t
keep-date preserve-uid-gid) keep-date preserve-uid-gid)
(tramp-run-real-handler (tramp-run-real-handler
'rename-file 'rename-file
(list localname1 tmpfile ok-if-already-exists))) (list localname1 tmpfile t)))
;; We must change the ownership as local user. ;; We must change the ownership as local user.
(tramp-set-file-uid-gid (tramp-set-file-uid-gid
tmpfile tmpfile
...@@ -7758,9 +7758,6 @@ Only works for Bourne-like shells." ...@@ -7758,9 +7758,6 @@ Only works for Bourne-like shells."
;; Functions for file-name-handler-alist: ;; Functions for file-name-handler-alist:
;; diff-latest-backup-file -- in diff.el ;; diff-latest-backup-file -- in diff.el
;; dired-uncache -- this will be needed when we do insert-directory caching ;; dired-uncache -- this will be needed when we do insert-directory caching
;; file-name-sans-versions -- use primitive?
;; get-file-buffer -- use primitive
;; vc-registered
;; arch-tag: 3a21a994-182b-48fa-b0cd-c1d9fede424a ;; arch-tag: 3a21a994-182b-48fa-b0cd-c1d9fede424a
;;; tramp.el ends here ;;; tramp.el ends here
......
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