From 913775410bb1b30116c3550c43389747c3b0cf14 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 2 May 2012 11:43:30 -0400 Subject: [PATCH] update --- Utility/RsyncFile.hs | 2 +- ...c_remote__44___versions_3.20120315_and_3.20120430.mdwn | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Utility/RsyncFile.hs b/Utility/RsyncFile.hs index fae23d4ceb..db9057843c 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 ad97a82b2c..c57c645a01 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 @@ -56,7 +56,11 @@ The rsync remote config in .git/config: > 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 +> 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. +> the rsync protocol. It assumes that (and this is what the rsync man +> says AFAICS) that the rsync protocol is only used if the url starts +> with `rsync://` or contains `::`. > --[[Joey]]