From 490211a7f9cf9080bc913a481d8e11865931e46b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 19 Feb 2013 16:26:07 -0400 Subject: Direct mode: Support filesystems like FAT which can change their inodes each time they are mounted. --- Annex/Content.hs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Annex/Content.hs') diff --git a/Annex/Content.hs b/Annex/Content.hs index 871cedc42..0439cb367 100644 --- a/Annex/Content.hs +++ b/Annex/Content.hs @@ -304,8 +304,8 @@ prepSendAnnex key = withObjectLoc key indirect direct direct (f:fs) = do cache <- recordedInodeCache key -- check that we have a good file - ifM (liftIO $ compareInodeCache f cache) - ( return $ Just (f, liftIO $ compareInodeCache f cache) + ifM (sameInodeCache f cache) + ( return $ Just (f, sameInodeCache f cache) , direct fs ) @@ -356,7 +356,7 @@ removeAnnex key = withObjectLoc key remove removedirect cache <- recordedInodeCache key removeInodeCache key mapM_ (resetfile cache) fs - resetfile cache f = whenM (liftIO $ compareInodeCache f cache) $ do + resetfile cache f = whenM (sameInodeCache f cache) $ do l <- calcGitLink f key top <- fromRepo Git.repoPath cwd <- liftIO getCurrentDirectory -- cgit v1.2.3