diff options
Diffstat (limited to 'Annex')
| -rw-r--r-- | Annex/Branch/Transitions.hs | 2 | ||||
| -rw-r--r-- | Annex/Transfer.hs | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Annex/Branch/Transitions.hs b/Annex/Branch/Transitions.hs index 4c39f198f..f5833c0bc 100644 --- a/Annex/Branch/Transitions.hs +++ b/Annex/Branch/Transitions.hs @@ -51,7 +51,7 @@ dropDead f content trustmap = case getLogVariety f of Just OtherLog -> PreserveFile Nothing -> PreserveFile -dropDeadFromMapLog :: TrustMap -> (k -> UUID) -> M.Map k v -> M.Map k v +dropDeadFromMapLog :: Ord k => TrustMap -> (k -> UUID) -> M.Map k v -> M.Map k v dropDeadFromMapLog trustmap getuuid = M.filterWithKey $ \k _v -> notDead trustmap getuuid k {- Presence logs can contain UUIDs or other values. Any line that matches diff --git a/Annex/Transfer.hs b/Annex/Transfer.hs index df5aba09c..001539adc 100644 --- a/Annex/Transfer.hs +++ b/Annex/Transfer.hs @@ -106,7 +106,8 @@ runTransfer t file shouldretry a = do v <- tryAnnex run case v of Right b -> return b - Left _ -> do + Left e -> do + warning (show e) b <- getbytescomplete metervar let newinfo = oldinfo { bytesComplete = Just b } if shouldretry oldinfo newinfo |