summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-10-11 19:22:29 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-10-11 19:22:29 -0400
commit96808b8d883b7775fdf5be1b9a413d07bab299d7 (patch)
tree8421edcbcd8a53e38c6a3bee9f7e7e4ba47800e0
parent6e70ee66a9be5257df74a7a8c63f6c5f098ef009 (diff)
set/unset annex-sync, rather than annex-ignore
This reserves annex.ignore for repos that should not be visible at all; repos with syncing disabled are now skipped by the assistant, but are displayed in the list and can be configured.
-rw-r--r--Assistant/DaemonStatus.hs7
1 files changed, 5 insertions, 2 deletions
diff --git a/Assistant/DaemonStatus.hs b/Assistant/DaemonStatus.hs
index 11ea8676d..8146f977e 100644
--- a/Assistant/DaemonStatus.hs
+++ b/Assistant/DaemonStatus.hs
@@ -17,6 +17,8 @@ import Utility.NotificationBroadcaster
import Logs.Transfer
import Logs.Trust
import qualified Remote
+import qualified Types.Remote as Remote
+import Config
import Control.Concurrent.STM
import System.Posix.Types
@@ -86,10 +88,11 @@ modifyDaemonStatus dstatus a = do
sendNotification $ changeNotifier s
return b
-{- Remotes ordered by cost, with dead ones thrown out. -}
+{- Syncable remotes ordered by cost. -}
calcKnownRemotes :: Annex [Remote]
calcKnownRemotes = do
- rs <- concat . Remote.byCost <$> Remote.enabledRemoteList
+ rs <- filterM (repoSyncable . Remote.repo) =<<
+ concat . Remote.byCost <$> Remote.enabledRemoteList
alive <- snd <$> trustPartition DeadTrusted (map Remote.uuid rs)
let good r = Remote.uuid r `elem` alive
return $ filter good rs