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

chance case of "transfer failed" to match "Transfer stalled"

Browse source
This commit is contained in:
Joey Hess 2021-03-06 17:47:05 -04:00
parent e8065ee99d
commit 6940d4ad40
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 3 additions and 3 deletions
P2P
Annex.hs
Remote/Helper
P2P.hs

2
P2P/Annex.hs
View file

@ -94,7 +94,7 @@ runLocal runst runner a = case a of
let runtransfer ti = Right
<$> storefile dest o l getb iv validitycheck nullMeterUpdate ti
let fallback = return $ Left $
ProtoFailureMessage "transfer failed"
ProtoFailureMessage "Transfer failed"
checktransfer runtransfer fallback
case v of
Left e -> return $ Left $ ProtoFailureException e

4
Remote/Helper/P2P.hs
View file

@ -37,7 +37,7 @@ store runner k af p = do
metered (Just p) sizer $ \_ p' ->
runner p' (P2P.put k af p') >>= \case
Just True -> return ()
Just False -> giveup "transfer failed"
Just False -> giveup "Transfer failed"
Nothing -> remoteUnavail
retrieve :: VerifyConfig -> (MeterUpdate -> ProtoRunner (Bool, Verification)) -> Key -> AssociatedFile -> FilePath -> MeterUpdate -> Annex Verification
@ -46,7 +46,7 @@ retrieve verifyconfig runner k af dest p = do
metered (Just p) k $ \m p' ->
runner p' (P2P.get dest k iv af m p') >>= \case
Just (True, v) -> return v
Just (False, _) -> giveup "transfer failed"
Just (False, _) -> giveup "Transfer failed"
Nothing -> remoteUnavail
remove :: ProtoRunner Bool -> Key -> Annex ()