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

set simRootDirectory on restore

Browse source 
It's a relative directory and the cwd may be different. Or the repo
could have been moved.
This commit is contained in:
Joey Hess 2024-09-20 15:11:55 -04:00
parent bab330de33
commit 31679e3e9f
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Annex/Sim.hs
View file

@ -1089,13 +1089,14 @@ restoreSim rootdir =
Right c -> case readMaybe c :: Maybe (SimState ()) of Right c -> case readMaybe c :: Maybe (SimState ()) of
Nothing -> return (Left "unable to parse sim state file") Nothing -> return (Left "unable to parse sim state file")
Just st -> do Just st -> do
let st' = st { simRootDirectory = fromRawFilePath rootdir }
repostate <- M.fromList repostate <- M.fromList
<$> mapM (thaw st) (M.toList (simRepoState st)) <$> mapM (thaw st') (M.toList (simRepoState st))
let st' = st let st'' = st'
{ simRepoState = { simRepoState =
M.map (finishthaw st') repostate M.map (finishthaw st'') repostate
} }
return (Right st') return (Right st'')
where where
thaw st (u, rst) = tryNonAsync (thaw' st u) >>= return . \case thaw st (u, rst) = tryNonAsync (thaw' st u) >>= return . \case
Left _ -> (u, rst { simRepo = Nothing }) Left _ -> (u, rst { simRepo = Nothing })