mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

more RawFilePath conversion

Browse source 
451/645
This commit is contained in:
Joey Hess 2020-10-30 15:55:59 -04:00
parent b4b02e4c61
commit 87f91ce563
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
18 changed files with 57 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Remote/Git.hs
View file

@ -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
)