* net/tramp-gvfs.el (tramp-gvfs-handle-copy-file): Do not pass

empty argument to gvfs-copy.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fc5e087529ecdba12e5418908142b7625349d863..e01bebef0ed8e7a550af6b7b7fc2d7f35e28617b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-11  Magnus Henoch  <magnus.henoch@gmail.com>
+
+       * net/tramp-gvfs.el (tramp-gvfs-handle-copy-file): Do not pass
+       empty argument to gvfs-copy.
+
 2010-07-10  Aleksei Gusev  <aleksei.gusev@gmail.com>  (tiny change)
 
        * progmodes/compile.el (compilation-error-regexp-alist-alist): Add

diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el
index a984dd37fd8da072ab7cd8b38886a9acf754d683..202eaf598357721e7292ebb292b90d4597864b53 100644 (file)
--- a/lisp/net/tramp-gvfs.el
+++ b/lisp/net/tramp-gvfs.el
@@ -551,11 +551,14 @@ is no information where to trace the message.")
         (tramp-message v 4 "`copy-file' failed, trying `gvfs-copy'")
         (unless
             (zerop
-             (tramp-gvfs-send-command
-              v "gvfs-copy"
-              (if (or keep-date preserve-uid-gid) "--preserve" "")
-              (tramp-gvfs-url-file-name filename)
-              (tramp-gvfs-url-file-name newname)))
+             (let ((args
+                    (append (if (or keep-date preserve-uid-gid)
+                                (list "--preserve")
+                              nil)
+                            (list
+                             (tramp-gvfs-url-file-name filename)
+                             (tramp-gvfs-url-file-name newname)))))
+               (apply 'tramp-gvfs-send-command v "gvfs-copy" args)))
           ;; Propagate the error.
           (tramp-error v (car err) "%s" (cdr err)))))))