use createAnnexDirectory when setting up tmp dir
This commit is contained in:
parent
f8d422fe24
commit
5809f33f8b
2 changed files with 4 additions and 1 deletions
|
@ -16,6 +16,7 @@ import qualified Types.Backend
|
|||
import qualified Types.Key
|
||||
import qualified Backend
|
||||
import Annex.Content
|
||||
import Annex.Perms
|
||||
import Logs.Location
|
||||
import Logs.Trust
|
||||
import Annex.UUID
|
||||
|
@ -83,8 +84,8 @@ performRemote key file backend numcopies remote =
|
|||
withtmp a = do
|
||||
pid <- liftIO getProcessID
|
||||
t <- fromRepo gitAnnexTmpDir
|
||||
createAnnexDirectory t
|
||||
let tmp = t </> "fsck" ++ show pid ++ "." ++ keyFile key
|
||||
liftIO $ createDirectoryIfMissing True t
|
||||
let cleanup = liftIO $ catchIO (removeFile tmp) (const noop)
|
||||
cleanup
|
||||
cleanup `after` a tmp
|
||||
|
|
|
@ -19,6 +19,7 @@ import Remote.Helper.Special
|
|||
import Remote.Helper.Encryptable
|
||||
import Crypto
|
||||
import Utility.RsyncFile
|
||||
import Annex.Perms
|
||||
|
||||
type RsyncUrl = String
|
||||
|
||||
|
@ -176,6 +177,7 @@ withRsyncScratchDir :: (FilePath -> Annex Bool) -> Annex Bool
|
|||
withRsyncScratchDir a = do
|
||||
pid <- liftIO getProcessID
|
||||
t <- fromRepo gitAnnexTmpDir
|
||||
createAnnexDirectory t
|
||||
let tmp = t </> "rsynctmp" </> show pid
|
||||
nuke tmp
|
||||
liftIO $ createDirectoryIfMissing True tmp
|
||||
|
|
Loading…
Add table
Reference in a new issue