more RawFilePath conversion
451/645
This commit is contained in:
parent
b4b02e4c61
commit
87f91ce563
18 changed files with 57 additions and 56 deletions
|
@ -640,8 +640,8 @@ copyFromRemoteCheap r st repo
|
|||
loc <- liftIO $ gitAnnexLocation key repo gc
|
||||
liftIO $ ifM (R.doesPathExist loc)
|
||||
( do
|
||||
absloc <- absPath (fromRawFilePath loc)
|
||||
createSymbolicLink absloc file
|
||||
absloc <- absPath loc
|
||||
R.createSymbolicLink absloc (toRawFilePath file)
|
||||
, giveup "remote does not contain key"
|
||||
)
|
||||
| Git.repoIsSsh repo = Just $ \key af file ->
|
||||
|
@ -692,7 +692,7 @@ copyToRemote' repo r st@(State connpool duc _ _ _) key file meterupdate
|
|||
let rsp = RetrievalAllKeysSecure
|
||||
res <- Annex.Content.getViaTmp rsp verify key $ \dest ->
|
||||
metered (Just (combineMeterUpdate meterupdate p)) key $ \_ p' ->
|
||||
copier object dest p' (liftIO checksuccessio)
|
||||
copier object (fromRawFilePath dest) p' (liftIO checksuccessio)
|
||||
Annex.Content.saveState True
|
||||
return res
|
||||
)
|
||||
|
|
|
@ -352,7 +352,7 @@ sendParams = ifM crippledFileSystem
|
|||
- up trees for rsync. -}
|
||||
withRsyncScratchDir :: (FilePath -> Annex a) -> Annex a
|
||||
withRsyncScratchDir a = do
|
||||
t <- fromRepo gitAnnexTmpObjectDir
|
||||
t <- fromRawFilePath <$> fromRepo gitAnnexTmpObjectDir
|
||||
withTmpDirIn t "rsynctmp" a
|
||||
|
||||
rsyncRetrieve :: RsyncOpts -> [RsyncUrl] -> FilePath -> Maybe MeterUpdate -> Annex ()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue