From 4d269db5208dca3ce043e716d05a1c7bcc7a6755 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 26 Aug 2012 14:56:26 -0400 Subject: don't exclude special remotes from the knownRemotes list used by the assistant But do exclude them when pushing out changes. --- Assistant/DaemonStatus.hs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'Assistant/DaemonStatus.hs') diff --git a/Assistant/DaemonStatus.hs b/Assistant/DaemonStatus.hs index 4a9dfb4e2..4077eec88 100644 --- a/Assistant/DaemonStatus.hs +++ b/Assistant/DaemonStatus.hs @@ -14,7 +14,7 @@ import Utility.ThreadScheduler import Utility.TempFile import Utility.NotificationBroadcaster import Logs.Transfer -import qualified Command.Sync +import qualified Remote import Control.Concurrent.STM import System.Posix.Types @@ -81,11 +81,14 @@ modifyDaemonStatus dstatus a = do sendNotification $ changeNotifier s return b +calcKnownRemotes :: Annex [Remote] +calcKnownRemotes = concat . Remote.byCost <$> Remote.enabledRemoteList + {- Updates the cached ordered list of remotes from the list in Annex - state. -} updateKnownRemotes :: DaemonStatusHandle -> Annex () updateKnownRemotes dstatus = do - remotes <- Command.Sync.syncRemotes [] + remotes <- calcKnownRemotes liftIO $ modifyDaemonStatus_ dstatus $ \s -> s { knownRemotes = remotes } @@ -97,7 +100,7 @@ startDaemonStatus = do status <- liftIO $ catchDefaultIO (readDaemonStatusFile file) =<< newDaemonStatus transfers <- M.fromList <$> getTransfers - remotes <- Command.Sync.syncRemotes [] + remotes <- calcKnownRemotes liftIO $ atomically $ newTMVar status { scanComplete = False , sanityCheckRunning = False -- cgit v1.2.3