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

some more direct mode fixes

Browse source 
Avoid a crash if a mapping contains files that no longer exist.
This could happen because eg, one was deleted and a commit has not yet been
done to update the mapping.

Fix path calculation.
This commit is contained in:
Joey Hess 2013-01-18 12:39:26 -04:00
parent 5c58e9c101
commit e481ca7658
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Annex/Direct.hs
View file

@ -172,8 +172,8 @@ toDirectGen :: Key -> FilePath -> Annex (Maybe (Annex ()))
toDirectGen k f = do toDirectGen k f = do
loc <- inRepo $ gitAnnexLocation k loc <- inRepo $ gitAnnexLocation k
createContentDir loc -- thaws directory too createContentDir loc -- thaws directory too
top <- fromRepo Git.repoPath absf <- liftIO $ absPath f
locs <- filter (/= normalise (top </> f)) <$> addAssociatedFile k f locs <- filter (/= absf) <$> addAssociatedFile k f
case locs of case locs of
[] -> ifM (liftIO $ doesFileExist loc) [] -> ifM (liftIO $ doesFileExist loc)
( return $ Just $ do ( return $ Just $ do
@ -183,7 +183,7 @@ toDirectGen k f = do
liftIO $ replaceFile f $ moveFile loc liftIO $ replaceFile f $ moveFile loc
, return Nothing , return Nothing
) )
(loc':_) -> ifM (liftIO $ not . isSymbolicLink <$> getSymbolicLinkStatus loc') (loc':_) -> ifM (liftIO $ catchBoolIO $ not . isSymbolicLink <$> getSymbolicLinkStatus loc')
{- Another direct file has the content; copy it. -} {- Another direct file has the content; copy it. -}
( return $ Just $ do ( return $ Just $ do
liftIO $ replaceFile f $ liftIO $ replaceFile f $