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

Merge branch 'master' into git-remote-annex

Browse source
This commit is contained in:
Joey Hess 2024-05-15 17:49:12 -04:00
commit 468de43d66
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
4 changed files with 66 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Backend/Hash.hs
View file

@ -26,7 +26,6 @@ import Types.Backend
import Types.KeySource
import Utility.Hash
import Utility.Metered
import qualified Utility.RawFilePath as R
import qualified Data.ByteString as S
import qualified Data.ByteString.Short as S (toShort, fromShort)
@ -129,14 +128,9 @@ keyValueE hash source meterupdate =
checkKeyChecksum :: (Key -> String -> Bool) -> Hash -> Key -> RawFilePath -> Annex Bool
checkKeyChecksum issame hash key file = catchIOErrorType HardwareFault hwfault $ do
fast <- Annex.getRead Annex.fast
exists <- liftIO $ R.doesPathExist file
case (exists, fast) of
(True, False) -> do
showAction (UnquotedString descChecksum)
issame key
<$> hashFile hash file nullMeterUpdate
_ -> return True
showAction (UnquotedString descChecksum)
issame key
<$> hashFile hash file nullMeterUpdate
where
hwfault e = do
warning $ UnquotedString $ "hardware fault: " ++ show e