diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-02-19 16:26:07 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-02-19 17:31:03 -0400 |
| commit | 490211a7f9cf9080bc913a481d8e11865931e46b (patch) | |
| tree | 71fe44cb34462002aa58cb43618384eb77efc5e0 /Annex/Content.hs | |
| parent | 4e40b54a7516bbc9070faaef31254bd22154684e (diff) | |
Direct mode: Support filesystems like FAT which can change their inodes each time they are mounted.
Diffstat (limited to 'Annex/Content.hs')
| -rw-r--r-- | Annex/Content.hs | 6 |
1 files changed, 3 insertions, 3 deletions
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 |