From e21a32627fc600e6f7fa72929c95cfb49390dae3 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 2 Aug 2012 13:57:34 -0400
Subject: [PATCH] avoid bogus alert errors

---
 Assistant/Threads/Committer.hs | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/Assistant/Threads/Committer.hs b/Assistant/Threads/Committer.hs
index 2ca6a15b93..cce8d5e2b6 100644
--- a/Assistant/Threads/Committer.hs
+++ b/Assistant/Threads/Committer.hs
@@ -145,16 +145,19 @@ handleAdds st changechan transferqueue dstatus cs = returnWhen (null pendingadds
 		add :: Change -> IO (Maybe Change)
 		add change@(PendingAddChange { keySource = ks }) =
 			alertWhile' dstatus (addFileAlert $ keyFilename ks) $
-				liftM maybeMaybe $ catchMaybeIO $
+				liftM ret $ catchMaybeIO $
 					sanitycheck ks $ runThreadState st $ do
 						showStart "add" $ keyFilename ks
 						key <- Command.Add.ingest ks
 						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
 
-		maybeMaybe (Just j@(Just _)) = (True, j)
-		maybeMaybe _ = (False, Nothing)
-
 		handle _ _ Nothing = do
 			showEndFail
 			return Nothing