diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-01-01 13:52:47 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-01-01 13:58:14 -0400 |
| commit | 18a3a186e9cdb69ee503d961d8285a341d818c48 (patch) | |
| tree | d415a97f6c65e2268c948c6c2425d1b94b16df92 /Assistant | |
| parent | b6e3e7516dfdc054b9e1a281b2e49b392d235ee2 (diff) | |
type based git config handling for remotes
Still a couple of places that use git config ad-hoc, but this is most of it
done.
Diffstat (limited to 'Assistant')
| -rw-r--r-- | Assistant/DaemonStatus.hs | 3 | ||||
| -rw-r--r-- | Assistant/Threads/Committer.hs | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/Assistant/DaemonStatus.hs b/Assistant/DaemonStatus.hs index cb9133b2a..28383a4dd 100644 --- a/Assistant/DaemonStatus.hs +++ b/Assistant/DaemonStatus.hs @@ -17,7 +17,6 @@ import Logs.Trust import qualified Remote import qualified Types.Remote as Remote import qualified Git -import Config import Control.Concurrent.STM import System.Posix.Types @@ -48,7 +47,7 @@ modifyDaemonStatus a = do {- Returns a function that updates the lists of syncable remotes. -} calcSyncRemotes :: Annex (DaemonStatus -> DaemonStatus) calcSyncRemotes = do - rs <- filterM (repoSyncable . Remote.repo) =<< + rs <- filter (remoteAnnexSync . Remote.gitconfig) . concat . Remote.byCost <$> Remote.enabledRemoteList alive <- trustExclude DeadTrusted (map Remote.uuid rs) let good r = Remote.uuid r `elem` alive diff --git a/Assistant/Threads/Committer.hs b/Assistant/Threads/Committer.hs index 7940b0836..6e5412e00 100644 --- a/Assistant/Threads/Committer.hs +++ b/Assistant/Threads/Committer.hs @@ -44,7 +44,7 @@ commitThread :: NamedThread commitThread = NamedThread "Committer" $ do delayadd <- liftAnnex $ maybe delayaddDefault (return . Just . Seconds) - =<< annexDelayAdd <$> Annex.getConfig + =<< annexDelayAdd <$> Annex.getGitConfig runEvery (Seconds 1) <~> do -- We already waited one second as a simple rate limiter. -- Next, wait until at least one change is available for |