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

OsPath build fixes

Browse source
This commit is contained in:
Joey Hess 2025-03-04 15:50:15 -04:00
parent 17ce1b4e7b
commit 4a4a614b0d
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Remote/Compute.hs
View file

@ -262,7 +262,15 @@ parseComputeState k b =
let st = go emptycomputestate (parseQuery b) let st = go emptycomputestate (parseQuery b)
in if st == emptycomputestate then Nothing else Just st in if st == emptycomputestate then Nothing else Just st
where where
emptycomputestate = ComputeState mempty mempty mempty "." False False emptycomputestate = ComputeState
{ computeParams = mempty
, computeInputs = mempty
, computeOutputs = mempty
, computeSubdir = literalOsPath "."
, computeReproducible = False
, computeInputsUnavailable = False
}
go :: ComputeState -> [QueryItem] -> ComputeState go :: ComputeState -> [QueryItem] -> ComputeState
go c [] = c { computeParams = reverse (computeParams c) } go c [] = c { computeParams = reverse (computeParams c) }
go c ((f, v):rest) = go c ((f, v):rest) =
@ -370,7 +378,7 @@ runComputeProgram
-> Annex v -> Annex v
runComputeProgram (ComputeProgram program) state (ImmutableState immutablestate) getinputcontent cont = runComputeProgram (ComputeProgram program) state (ImmutableState immutablestate) getinputcontent cont =
withOtherTmp $ \othertmpdir -> withOtherTmp $ \othertmpdir ->
withTmpDirIn othertmpdir "compute" go withTmpDirIn othertmpdir (literalOsPath "compute") go
where where
go tmpdir = do go tmpdir = do
environ <- computeProgramEnvironment state environ <- computeProgramEnvironment state
@ -483,7 +491,7 @@ runComputeProgram (ComputeProgram program) state (ImmutableState immutablestate)
-- to the program as a parameter, which could parse it as a dashed -- to the program as a parameter, which could parse it as a dashed
-- option or other special parameter. -- option or other special parameter.
populategitsha gitsha tmpdir = do populategitsha gitsha tmpdir = do
let f = tmpdir </> ".git" </> "objects" let f = tmpdir </> literalOsPath ".git" </> literalOsPath "objects"
</> toOsPath (Git.fromRef' gitsha) </> toOsPath (Git.fromRef' gitsha)
liftIO $ createDirectoryIfMissing True $ takeDirectory f liftIO $ createDirectoryIfMissing True $ takeDirectory f
liftIO . F.writeFile f =<< catObject gitsha liftIO . F.writeFile f =<< catObject gitsha
@ -510,7 +518,7 @@ computeKey rs (ComputeProgram program) k _af dest p vc =
missingstate = giveup "Missing compute state" missingstate = giveup "Missing compute state"
getinputcontent state f = getinputcontent state f =
case M.lookup (fromOsPath f) (computeInputs state) of case M.lookup f (computeInputs state) of
Just inputkey -> case keyGitSha inputkey of Just inputkey -> case keyGitSha inputkey of
Nothing -> Nothing ->
let retkey = do let retkey = do