diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-10-30 17:14:26 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-10-30 17:14:51 -0400 |
| commit | 4318f594d544320825093de8661ed1b40e4774d5 (patch) | |
| tree | 709dcd2fe739c503651bc7bd5e1df35a52a27977 /Assistant/Threads/Merger.hs | |
| parent | 07cd1b2b40735d460c8225762fcf3992b9886c60 (diff) | |
finished pushing Assistant monad into all relevant files
All temporary and old functions are removed.
Diffstat (limited to 'Assistant/Threads/Merger.hs')
| -rw-r--r-- | Assistant/Threads/Merger.hs | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Assistant/Threads/Merger.hs b/Assistant/Threads/Merger.hs index 46511701c..44056dc35 100644 --- a/Assistant/Threads/Merger.hs +++ b/Assistant/Threads/Merger.hs @@ -67,11 +67,8 @@ onAdd file | ".lock" `isSuffixOf` file = noop | isAnnexBranch file = do branchChanged - transferqueue <- getAssistant transferQueue - dstatus <- getAssistant daemonStatusHandle - liftAnnex $ - whenM Annex.Branch.forceUpdate $ - queueDeferredDownloads Later transferqueue dstatus + whenM (liftAnnex Annex.Branch.forceUpdate) $ + queueDeferredDownloads Later | "/synced/" `isInfixOf` file = do mergecurrent =<< liftAnnex (inRepo Git.Branch.current) | otherwise = noop |