diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-10-29 19:20:54 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-10-29 19:20:54 -0400 |
| commit | c65199b29e85cb145d460b9e48fe2fc4a10aeb09 (patch) | |
| tree | d46f57dc2e021efd8080bc02c9231c603e00963e /Assistant/Threads | |
| parent | cb504374b53a940ea12feeb5ba91dd78466be455 (diff) | |
split BranchChange and lifted
Diffstat (limited to 'Assistant/Threads')
| -rw-r--r-- | Assistant/Threads/ConfigMonitor.hs | 2 | ||||
| -rw-r--r-- | Assistant/Threads/Merger.hs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Assistant/Threads/ConfigMonitor.hs b/Assistant/Threads/ConfigMonitor.hs index fe98b10e8..aa4718cf3 100644 --- a/Assistant/Threads/ConfigMonitor.hs +++ b/Assistant/Threads/ConfigMonitor.hs @@ -39,7 +39,7 @@ configMonitorThread = NamedThread "ConfigMonitor" $ loop =<< getConfigs where loop old = do liftIO $ threadDelaySeconds (Seconds 60) - waitBranchChange <<~ branchChangeHandle + waitBranchChange new <- getConfigs when (old /= new) $ do let changedconfigs = new `S.difference` old diff --git a/Assistant/Threads/Merger.hs b/Assistant/Threads/Merger.hs index a766c5977..46511701c 100644 --- a/Assistant/Threads/Merger.hs +++ b/Assistant/Threads/Merger.hs @@ -66,7 +66,7 @@ onAdd :: Handler onAdd file | ".lock" `isSuffixOf` file = noop | isAnnexBranch file = do - branchChanged <<~ branchChangeHandle + branchChanged transferqueue <- getAssistant transferQueue dstatus <- getAssistant daemonStatusHandle liftAnnex $ |