From: Michael Albinus <michael.albinus@gmx.de>
Date: Thu, 7 Jul 2016 16:50:24 +0000 (+0200)
Subject: Fix an error in Tramp for rsync
X-Git-Tag: emacs-26.0.90~1840^2~103
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7f8e742833e058fa41c273ff35351b02b6e8d42b;p=emacs.git

Fix an error in Tramp for rsync

* lisp/net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band):
Make it work for "rsync".
(tramp-make-copy-program-file-name): Apply `directory-file-name'.
---

diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 606572b9c7d..430c1c1d877 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -2375,19 +2375,17 @@ The method used must be an out-of-band method."
 	(aset v 3 localname)
 
 	;; Check which ones of source and target are Tramp files.
-	(setq source (if t1
-			 (tramp-make-copy-program-file-name v)
-		       (shell-quote-argument filename))
-	      target (funcall
+	(setq source (funcall
 		      (if (and (file-directory-p filename)
-			       (string-equal
-				(file-name-nondirectory filename)
-				(file-name-nondirectory newname)))
-			  'file-name-directory
+			       (not (file-exists-p newname)))
+			  'file-name-as-directory
 			'identity)
-		      (if t2
+		      (if t1
 			  (tramp-make-copy-program-file-name v)
-			(shell-quote-argument newname))))
+			(shell-quote-argument filename)))
+	      target (if t2
+			 (tramp-make-copy-program-file-name v)
+		       (shell-quote-argument newname)))
 
 	;; Check for host and port number.  We cannot use
 	;; `tramp-file-name-port', because this returns also
@@ -5102,7 +5100,7 @@ Return ATTR."
   (let ((method (tramp-file-name-method vec))
 	(user (tramp-file-name-user vec))
 	(host (tramp-file-name-real-host vec))
-	(localname (tramp-file-name-localname vec)))
+	(localname (directory-file-name (tramp-file-name-localname vec))))
     (when (string-match tramp-ipv6-regexp host)
       (setq host (format "[%s]" host)))
     (unless (string-match "ftp$" method)