summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-05-02 11:38:27 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-05-02 11:38:27 -0400
commit5337c4e0c4e9f7a803a77532057a20f7c54fe28a (patch)
tree6495a3984ec8d84dd402baa3f749c6f8707db5dc
parent834e73cde5f1669384641a8df3b8c542e240db29 (diff)
rsync protocol?
-rw-r--r--Utility/RsyncFile.hs2
-rw-r--r--doc/bugs/Error___39__get__39__ting_files_from_rsync_remote__44___versions_3.20120315_and_3.20120430.mdwn13
2 files changed, 14 insertions, 1 deletions
diff --git a/Utility/RsyncFile.hs b/Utility/RsyncFile.hs
index a691d0a0e..fae23d4ce 100644
--- a/Utility/RsyncFile.hs
+++ b/Utility/RsyncFile.hs
@@ -58,7 +58,7 @@ rsyncUrlIsShell s
| "rsync://" `isPrefixOf` s = False
| otherwise = go s
where
- -- host:dir is rsync protocol, while host:dir is ssh/rsh
+ -- host:dir is rsync protocol, while host/dir is ssh/rsh
go [] = False
go (c:cs)
| c == '/' = False -- got to directory with no colon
diff --git a/doc/bugs/Error___39__get__39__ting_files_from_rsync_remote__44___versions_3.20120315_and_3.20120430.mdwn b/doc/bugs/Error___39__get__39__ting_files_from_rsync_remote__44___versions_3.20120315_and_3.20120430.mdwn
index d8c15ed26..ad97a82b2 100644
--- a/doc/bugs/Error___39__get__39__ting_files_from_rsync_remote__44___versions_3.20120315_and_3.20120430.mdwn
+++ b/doc/bugs/Error___39__get__39__ting_files_from_rsync_remote__44___versions_3.20120315_and_3.20120430.mdwn
@@ -47,3 +47,16 @@ The rsync remote config in .git/config:
[remote "rsyncremote"]
annex-rsyncurl = myuser@rsync.hidrive.strato.com:/users/myuser/git-annex/Music/
annex-uuid = "UUID"
+
+> Here's what the --debug flag shows is being run:
+
+ Running: rsync ["--progress","--inplace","joey@localhost:/tmp/Music/d98/a3c/'GPGHMACSHA1--878c3a3f59965bd87b4738ab29562efd215b954c/GPGHMACSHA1--878c3a3f59965bd87b4738ab29562efd215b954c'","/home/joey/tmp/x/.git/annex/tmp/GPGHMACSHA1--878c3a3f59965bd87b4738ab29562efd215b954c"]
+
+> But, this works for me, here, despite containing the quoting!
+> That's because here it's using rsync over ssh, which actually requires
+> that quoting. Are you using rsync
+> over the rsync protocol? If so, the workaround is to explicitly make
+> the rsyncurl start with `rsync://` -- and if this is the case, I need
+> to adjust the code in git-annex that determines if it's using ssh or
+> the rsync protocol.
+> --[[Joey]]