summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-03-27 14:25:49 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-03-27 14:25:49 -0400
commitc96dea4df695fb7516ea801ab7909da4bea29bcc (patch)
treeb993789e030d1e1b16a53c97c3b2764526f4c152
parent0739cf138ee74640a5fb7f68e024aa416a67da7b (diff)
avoid displaying alert when syncing only to removable drives and all not attached
-rw-r--r--Assistant/Sync.hs6
-rw-r--r--git-annex.cabal2
2 files changed, 5 insertions, 3 deletions
diff --git a/Assistant/Sync.hs b/Assistant/Sync.hs
index 1c8f84fcd..16a16276f 100644
--- a/Assistant/Sync.hs
+++ b/Assistant/Sync.hs
@@ -167,8 +167,10 @@ syncAction rs a
failed <- a rs
let failed' = filter (not . Git.repoIsLocalUnknown . Remote.repo) failed
let succeeded = filter (`notElem` failed) nonxmppremotes
- updateAlertMap $ mergeAlert i $
- syncResultAlert succeeded failed'
+ if null succeeded && null failed'
+ then removeAlert i
+ else updateAlertMap $ mergeAlert i $
+ syncResultAlert succeeded failed'
return failed
where
nonxmppremotes = filter (not . isXMPPRemote) rs
diff --git a/git-annex.cabal b/git-annex.cabal
index 8a36e5f4f..f82ca8048 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -1,5 +1,5 @@
Name: git-annex
-Version: 4.20130323
+Version: 4.20130324
Cabal-Version: >= 1.8
License: GPL
Maintainer: Joey Hess <joey@kitenet.net>