diff --git a/Annex/Verify.hs b/Annex/Verify.hs index 3df646b7a8..22cdf02c92 100644 --- a/Annex/Verify.hs +++ b/Annex/Verify.hs @@ -16,6 +16,7 @@ module Annex.Verify ( warnUnverifiableInsecure, isVerifiable, startVerifyKeyContentIncrementally, + finishVerifyKeyContentIncrementally, IncrementalVerifier(..), tailVerify, ) where @@ -167,6 +168,17 @@ startVerifyKeyContentIncrementally verifyconfig k = , return Nothing ) +finishVerifyKeyContentIncrementally :: Maybe IncrementalVerifier -> Annex (Bool, Verification) +finishVerifyKeyContentIncrementally Nothing = + return (True, UnVerified) +finishVerifyKeyContentIncrementally (Just iv) = + ifM (liftIO $ finalizeIncremental iv) + ( return (True, Verified) + , do + warning "verification of content failed" + return (False, UnVerified) + ) + -- | Reads the file as it grows, and feeds it to the incremental verifier. -- -- The TMVar must start out empty, and be filled once whatever is diff --git a/Remote/Git.hs b/Remote/Git.hs index 352b920069..08f7e90431 100644 --- a/Remote/Git.hs +++ b/Remote/Git.hs @@ -867,14 +867,7 @@ mkFileCopier remotewanthardlink (State _ _ copycowtried _ _) = do iv <- startVerifyKeyContentIncrementally verifyconfig k fileCopier copycowtried src dest p iv >>= \case Copied -> ifM check - ( case iv of - Just x -> ifM (liftIO $ finalizeIncremental x) - ( return (True, Verified) - , do - warning "verification of content failed" - return (False, UnVerified) - ) - Nothing -> return (True, UnVerified) + ( finishVerifyKeyContentIncrementally iv , return (False, UnVerified) ) CopiedCoW -> unVerified check