fix meter display on resume

It still needs to be offset, otherwise on resume from 80% it will
display 1%..20%.

Seems that this bug must have affected P2P.Annex as well where it runs
this code, but apparently it didn't affect it in a very user-visible
way. Maybe the transfer log file was updated incorrectly?

diff --git a/Annex/Verify.hs b/Annex/Verify.hs
index c7da82f2251161f839792dddf9eb69712cb97a02..26ebb1d9176a0d2336fba3228f853f8452293538 100644 (file)
--- a/Annex/Verify.hs
+++ b/Annex/Verify.hs
@@ -224,28 +224,29 @@ writeVerifyChunk Nothing h c = S.hPut h c
 
 {- Given a file handle that is open for reading (and likely also for writing),
  - and an offset, feeds the current content of the file up to the offset to
- - the  IncrementalVerifier. Leaves the file seeked to the offset. 
- - Also updates the meter to the offset. -}
+ - the  IncrementalVerifier. Leaves the file seeked to the offset.
+ - Returns the meter with the offset applied. -}
 resumeVerifyFromOffset
        :: Integer
        -> Maybe IncrementalVerifier
        -> MeterUpdate
        -> Handle
        -> IO MeterUpdate
-resumeVerifyFromOffset o incrementalverifier p h
+resumeVerifyFromOffset o incrementalverifier meterupdate h
        | o /= 0 = do
                p' <- case incrementalverifier of
                        Just iv -> do
                                go iv o
-                               return p
-                       _ -> return $ offsetMeterUpdate p (toBytesProcessed o)
+                               return offsetmeterupdate
+                       _ -> return offsetmeterupdate
                -- Make sure the handle is seeked to the offset.
                -- (Reading the file probably left it there
                -- when that was done, but let's be sure.)
                hSeek h AbsoluteSeek o
                return p'
-       | otherwise = return p
+       | otherwise = return meterupdate
   where
+       offsetmeterupdate = offsetMeterUpdate meterupdate (toBytesProcessed o)
        go iv n
                | n == 0 = return ()
                | otherwise = do