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

reinject: When src file's content cannot be verified, leave it alone, instead of deleting it.

Browse source
This commit is contained in:
Joey Hess 2016-04-20 13:21:56 -04:00
parent bb92b45fb7
commit 9d952fe9d1
Failed to extract signature
5 changed files with 31 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Command/TestRemote.hs
View file

@ -11,7 +11,7 @@ import Command
import qualified Annex
import qualified Remote
import qualified Types.Remote as Remote
import Types.Backend (getKey, verifyKeyContent)
import qualified Types.Backend as Backend
import Types.KeySource
import Annex.Content
import Backend
@ -151,7 +151,7 @@ test st r k =
(== Right b) <$> Remote.hasKey r k
fsck = case maybeLookupBackendName (keyBackendName k) of
Nothing -> return True
Just b -> case verifyKeyContent b of
Just b -> case Backend.verifyKeyContent b of
Nothing -> return True
Just verifier -> verifier k (key2file k)
get = getViaTmp (RemoteVerify r) k $ \dest ->
@ -224,6 +224,6 @@ randKey sz = withTmpFile "randkey" $ \f h -> do
, inodeCache = Nothing
}
k <- fromMaybe (error "failed to generate random key")
<$> getKey Backend.Hash.testKeyBackend ks
<$> Backend.getKey Backend.Hash.testKeyBackend ks
moveAnnex k f
return k