Revert "temporary debugging code for windows autobuilder test suite failure"
This reverts commit 0d9fbd18c1
.
This commit is contained in:
parent
0d9fbd18c1
commit
33f1062bc3
1 changed files with 10 additions and 22 deletions
|
@ -130,13 +130,9 @@ goodContent key file = sameInodeCache file =<< recordedInodeCache key
|
|||
- A key can be associated with multiple files, so may return more than
|
||||
- one. -}
|
||||
recordedInodeCache :: Key -> Annex [InodeCache]
|
||||
recordedInodeCache key = do
|
||||
liftIO $ print ("recordedInodeCache", key, "start")
|
||||
r <- withInodeCacheFile key $ \f ->
|
||||
liftIO $ catchDefaultIO [] $
|
||||
mapMaybe readInodeCache . lines <$> readFileStrict f
|
||||
liftIO $ print ("recordedInodeCache", key, "end")
|
||||
return r
|
||||
recordedInodeCache key = withInodeCacheFile key $ \f ->
|
||||
liftIO $ catchDefaultIO [] $
|
||||
mapMaybe readInodeCache . lines <$> readFileStrict f
|
||||
|
||||
{- Caches an inode for a file.
|
||||
-
|
||||
|
@ -155,24 +151,16 @@ addInodeCache key cache = do
|
|||
|
||||
{- Writes inode cache for a key. -}
|
||||
writeInodeCache :: Key -> [InodeCache] -> Annex ()
|
||||
writeInodeCache key caches = do
|
||||
liftIO $ print ("writeInodeCache", key, "start")
|
||||
r <- withInodeCacheFile key $ \f ->
|
||||
modifyContent f $
|
||||
liftIO $ writeFile f $
|
||||
unlines $ map showInodeCache caches
|
||||
liftIO $ print ("writeInodeCache", key, "stop")
|
||||
return r
|
||||
writeInodeCache key caches = withInodeCacheFile key $ \f ->
|
||||
modifyContent f $
|
||||
liftIO $ writeFile f $
|
||||
unlines $ map showInodeCache caches
|
||||
|
||||
{- Removes an inode cache. -}
|
||||
removeInodeCache :: Key -> Annex ()
|
||||
removeInodeCache key = do
|
||||
liftIO $ print ("removeInodeCache", key, "start")
|
||||
r <- withInodeCacheFile key $ \f ->
|
||||
modifyContent f $
|
||||
liftIO $ nukeFile f
|
||||
liftIO $ print ("removeInodeCache", key, "stop")
|
||||
return r
|
||||
removeInodeCache key = withInodeCacheFile key $ \f ->
|
||||
modifyContent f $
|
||||
liftIO $ nukeFile f
|
||||
|
||||
withInodeCacheFile :: Key -> (FilePath -> Annex a) -> Annex a
|
||||
withInodeCacheFile key a = a =<< calcRepo (gitAnnexInodeCache key)
|
||||
|
|
Loading…
Reference in a new issue