deal with Cygwin rsync paths issue

This commit is contained in:
Joey Hess 2013-05-14 13:24:15 -04:00
parent 43f2de8522
commit 03a0f17fbb
4 changed files with 39 additions and 6 deletions

View file

@ -425,7 +425,7 @@ rsyncOrCopyFile rsyncparams src dest p =
_ -> watchfilesize oldsz
#endif
dorsync = rsyncHelper (Just p) $
rsyncparams ++ [Param src, Param dest]
rsyncparams ++ [File src, File dest]
{- Generates rsync parameters that ssh to the remote and asks it
- to either receive or send the key's content. -}

View file

@ -242,7 +242,7 @@ rsyncRetrieve o k dest callback =
-- use inplace when retrieving to support resuming
[ Param "--inplace"
, Param u
, Param dest
, File dest
]
rsyncRemote :: RsyncOpts -> (Maybe MeterUpdate) -> [CommandParam] -> Annex Bool
@ -292,7 +292,7 @@ rsyncSend o callback k canrename src = withRsyncScratchDir $ \tmp -> do
[ Param "--recursive"
, partialParams
-- tmp/ to send contents of tmp dir
, Param $ addTrailingPathSeparator tmp
, File $ addTrailingPathSeparator tmp
, Param $ rsyncUrl o
]
else return False