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

more RawFilePath conversion

Browse source 
Better to use Git.repoPath to get a filepath, Git.repoLocation does not
always return one.

This commit was sponsored by Ethan Aubin.
This commit is contained in:
Joey Hess 2020-10-30 13:00:12 -04:00
parent 19694fb280
commit 8f452416f7
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Remote/GCrypt.hs
View file

@ -1,6 +1,6 @@
{- git remotes encrypted using git-remote-gcrypt {- git remotes encrypted using git-remote-gcrypt
- -
- Copyright 2013 Joey Hess <id@joeyh.name> - Copyright 2013-2020 Joey Hess <id@joeyh.name>
- -
- Licensed under the GNU AGPL version 3 or higher. - Licensed under the GNU AGPL version 3 or higher.
-} -}
@ -20,6 +20,7 @@ module Remote.GCrypt (
import qualified Data.Map as M import qualified Data.Map as M
import qualified Data.ByteString as S import qualified Data.ByteString as S
import qualified Data.ByteString.Lazy as L import qualified Data.ByteString.Lazy as L
import qualified System.FilePath.ByteString as P
import Control.Exception import Control.Exception
import Data.Default import Data.Default
@ -58,6 +59,7 @@ import Logs.Remote
import Utility.Gpg import Utility.Gpg
import Utility.SshHost import Utility.SshHost
import Utility.Tuple import Utility.Tuple
import Utility.Directory.Create
import Messages.Progress import Messages.Progress
import Types.ProposedAccepted import Types.ProposedAccepted
@ -284,7 +286,7 @@ setupRepo gcryptid r
- which is needed for direct rsync of objects to work. - which is needed for direct rsync of objects to work.
-} -}
rsyncsetup = Remote.Rsync.withRsyncScratchDir $ \tmp -> do rsyncsetup = Remote.Rsync.withRsyncScratchDir $ \tmp -> do
createAnnexDirectory (tmp </> objectDir) createAnnexDirectory (toRawFilePath (tmp </> objectDir))
dummycfg <- liftIO dummyRemoteGitConfig dummycfg <- liftIO dummyRemoteGitConfig
(rsynctransport, rsyncurl, _) <- rsyncTransport r dummycfg (rsynctransport, rsyncurl, _) <- rsyncTransport r dummycfg
let tmpconfig = tmp </> "config" let tmpconfig = tmp </> "config"
@ -368,12 +370,12 @@ store' :: Git.Repo -> Remote -> Remote.Rsync.RsyncOpts -> Storer
store' repo r rsyncopts store' repo r rsyncopts
| not $ Git.repoIsUrl repo = | not $ Git.repoIsUrl repo =
byteStorer $ \k b p -> guardUsable repo (giveup "cannot access remote") $ liftIO $ do byteStorer $ \k b p -> guardUsable repo (giveup "cannot access remote") $ liftIO $ do
let tmpdir = Git.repoLocation repo </> "tmp" </> fromRawFilePath (keyFile k) let tmpdir = Git.repoPath repo P.</> "tmp" P.</> keyFile k
void $ tryIO $ createDirectoryUnder (Git.repoLocation repo) tmpdir void $ tryIO $ createDirectoryUnder (Git.repoPath repo) tmpdir
let tmpf = tmpdir </> fromRawFilePath (keyFile k) let tmpf = tmpdir P.</> keyFile k
meteredWriteFile p tmpf b meteredWriteFile p (fromRawFilePath tmpf) b
let destdir = parentDir $ gCryptLocation repo k let destdir = parentDir $ toRawFilePath $ gCryptLocation repo k
Remote.Directory.finalizeStoreGeneric (Git.repoLocation repo) tmpdir destdir Remote.Directory.finalizeStoreGeneric (Git.repoPath repo) tmpdir destdir
| Git.repoIsSsh repo = if accessShell r | Git.repoIsSsh repo = if accessShell r
then fileStorer $ \k f p -> do then fileStorer $ \k f p -> do
oh <- mkOutputHandler oh <- mkOutputHandler
@ -414,7 +416,9 @@ remove r rsyncopts k = do
remove' :: Git.Repo -> Remote -> Remote.Rsync.RsyncOpts -> Remover remove' :: Git.Repo -> Remote -> Remote.Rsync.RsyncOpts -> Remover
remove' repo r rsyncopts k remove' repo r rsyncopts k
| not $ Git.repoIsUrl repo = guardUsable repo (giveup "cannot access remote") $ | not $ Git.repoIsUrl repo = guardUsable repo (giveup "cannot access remote") $
liftIO $ Remote.Directory.removeDirGeneric (Git.repoLocation repo) (parentDir (gCryptLocation repo k)) liftIO $ Remote.Directory.removeDirGeneric
(fromRawFilePath (Git.repoPath repo))
(fromRawFilePath (parentDir (toRawFilePath (gCryptLocation repo k))))
| Git.repoIsSsh repo = shellOrRsync r removeshell removersync | Git.repoIsSsh repo = shellOrRsync r removeshell removersync
| otherwise = unsupportedUrl | otherwise = unsupportedUrl
where where