diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-05-14 13:24:15 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-05-14 13:24:15 -0400 |
| commit | 62382fa360e16c83eb33634367ede0b95e467c6e (patch) | |
| tree | 382d07220dddc8fdcb4543bc25eb26df850e4ca1 /Remote | |
| parent | 174da3515594fea9ebc1b346d8a52bfd16a443bf (diff) | |
deal with Cygwin rsync paths issue
Diffstat (limited to 'Remote')
| -rw-r--r-- | Remote/Git.hs | 2 | ||||
| -rw-r--r-- | Remote/Rsync.hs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Remote/Git.hs b/Remote/Git.hs index 3f88a0334..7c7540543 100644 --- a/Remote/Git.hs +++ b/Remote/Git.hs @@ -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. -} diff --git a/Remote/Rsync.hs b/Remote/Rsync.hs index 768c15777..f7abbbf2a 100644 --- a/Remote/Rsync.hs +++ b/Remote/Rsync.hs @@ -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 |