diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-02-14 16:17:40 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-02-14 16:17:40 -0400 |
| commit | 5fc9ccdaa5c73ec424de175962f98cc8fd63eca0 (patch) | |
| tree | 1030a6fe9d351709bcdada518d4a24fa4986ed18 /Command | |
| parent | 177245deb6ee3271eb44d77c2b0cd722755b2c3f (diff) | |
split out Utility.InodeCache
Diffstat (limited to 'Command')
| -rw-r--r-- | Command/Add.hs | 6 | ||||
| -rw-r--r-- | Command/Indirect.hs | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Command/Add.hs b/Command/Add.hs index f6b43034c..7fff5e778 100644 --- a/Command/Add.hs +++ b/Command/Add.hs @@ -95,7 +95,7 @@ ingest (Just source) = do ( do mstat <- liftIO $ catchMaybeIO $ getSymbolicLinkStatus $ keyFilename source k <- genKey source backend - godirect k (toCache =<< mstat) + godirect k (toInodeCache =<< mstat) , go =<< genKey source backend ) where @@ -107,9 +107,9 @@ ingest (Just source) = do go Nothing = failure godirect (Just (key, _)) (Just cache) = - ifM (compareCache (keyFilename source) $ Just cache) + ifM (liftIO $ compareInodeCache (keyFilename source) $ Just cache) ( do - writeCache key cache + writeInodeCache key cache void $ addAssociatedFile key $ keyFilename source unlessM crippledFileSystem $ liftIO $ allowWrite $ keyFilename source diff --git a/Command/Indirect.hs b/Command/Indirect.hs index 168d837ff..e09e3c9be 100644 --- a/Command/Indirect.hs +++ b/Command/Indirect.hs @@ -73,7 +73,7 @@ perform = do showEndOk cleandirect k = do - liftIO . nukeFile =<< inRepo (gitAnnexCache k) + liftIO . nukeFile =<< inRepo (gitAnnexInodeCache k) liftIO . nukeFile =<< inRepo (gitAnnexMapping k) cleanup :: CommandCleanup |