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

avoid bogus alert errors

Browse source
This commit is contained in:
Joey Hess 2012-08-02 13:57:34 -04:00
parent a6e4283fed
commit e21a32627f
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Assistant/Threads/Committer.hs
View file

@ -145,16 +145,19 @@ handleAdds st changechan transferqueue dstatus cs = returnWhen (null pendingadds
add :: Change -> IO (Maybe Change) add :: Change -> IO (Maybe Change)
add change@(PendingAddChange { keySource = ks }) = add change@(PendingAddChange { keySource = ks }) =
alertWhile' dstatus (addFileAlert $ keyFilename ks) $ alertWhile' dstatus (addFileAlert $ keyFilename ks) $
liftM maybeMaybe $ catchMaybeIO $ liftM ret $ catchMaybeIO $
sanitycheck ks $ runThreadState st $ do sanitycheck ks $ runThreadState st $ do
showStart "add" $ keyFilename ks showStart "add" $ keyFilename ks
key <- Command.Add.ingest ks key <- Command.Add.ingest ks
handle (finishedChange change) (keyFilename ks) key handle (finishedChange change) (keyFilename ks) key
where
{- Add errors tend to be transient and will
- be automatically dealt with, so don't
- pass to the alert code. -}
ret (Just j@(Just _)) = (True, j)
ret _ = (True, Nothing)
add _ = return Nothing add _ = return Nothing
maybeMaybe (Just j@(Just _)) = (True, j)
maybeMaybe _ = (False, Nothing)
handle _ _ Nothing = do handle _ _ Nothing = do
showEndFail showEndFail
return Nothing return Nothing