remove unused parameter
This commit is contained in:
parent
3af0e0b4de
commit
72a13d2a5f
1 changed files with 9 additions and 20 deletions
|
@ -460,29 +460,18 @@ checkBackendRemote backend key remote ai localcopy =
|
||||||
|
|
||||||
checkBackendOr :: (Key -> Annex String) -> Backend -> Key -> RawFilePath -> ActionItem -> Annex Bool
|
checkBackendOr :: (Key -> Annex String) -> Backend -> Key -> RawFilePath -> ActionItem -> Annex Bool
|
||||||
checkBackendOr bad backend key file ai =
|
checkBackendOr bad backend key file ai =
|
||||||
checkBackendOr' bad backend key file ai (return True)
|
|
||||||
|
|
||||||
-- The postcheck action is run after the content is verified,
|
|
||||||
-- in order to detect situations where the file is changed while being
|
|
||||||
-- verified.
|
|
||||||
checkBackendOr' :: (Key -> Annex String) -> Backend -> Key -> RawFilePath -> ActionItem -> Annex Bool -> Annex Bool
|
|
||||||
checkBackendOr' bad backend key file ai postcheck =
|
|
||||||
case Types.Backend.verifyKeyContent backend of
|
case Types.Backend.verifyKeyContent backend of
|
||||||
Nothing -> return True
|
|
||||||
Just verifier -> do
|
Just verifier -> do
|
||||||
ok <- verifier key file
|
ok <- verifier key file
|
||||||
ifM postcheck
|
unless ok $ do
|
||||||
( do
|
msg <- bad key
|
||||||
unless ok $ do
|
warning $ concat
|
||||||
msg <- bad key
|
[ decodeBS' (actionItemDesc ai)
|
||||||
warning $ concat
|
, ": Bad file content; "
|
||||||
[ decodeBS' (actionItemDesc ai)
|
, msg
|
||||||
, ": Bad file content; "
|
]
|
||||||
, msg
|
return ok
|
||||||
]
|
Nothing -> return True
|
||||||
return ok
|
|
||||||
, return True
|
|
||||||
)
|
|
||||||
|
|
||||||
checkKeyNumCopies :: Key -> AssociatedFile -> NumCopies -> Annex Bool
|
checkKeyNumCopies :: Key -> AssociatedFile -> NumCopies -> Annex Bool
|
||||||
checkKeyNumCopies key afile numcopies = do
|
checkKeyNumCopies key afile numcopies = do
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue