refactor

diff --git a/Annex/Verify.hs b/Annex/Verify.hs
index 3df646b7a8265b1dcb0310f96fb28edc074d8752..22cdf02c9272d69f0a6b788f688694bb4531a0fa 100644 (file)
--- 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 352b920069db9e708be1f9eb4fed0655a85f5aa4..08f7e904310656a78b0535f7c7fc56c30c254ac7 100644 (file)
--- 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