diff options
author | Joey Hess <joey@kitenet.net> | 2012-10-30 15:39:15 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2012-10-30 15:39:15 -0400 |
commit | 07cd1b2b40735d460c8225762fcf3992b9886c60 (patch) | |
tree | c08c38417dfd9cba94ac56e212fa9d5864927ac0 /Assistant/Threads/Watcher.hs | |
parent | bab7e83221468905b76e28bb123ebe26e146b97b (diff) |
pushed Assistant monad down into DaemonStatus code
Currently have three old versions of functions that more reworking is
needed to remove: getDaemonStatusOld, modifyDaemonStatusOld_, and
modifyDaemonStatusOld
Diffstat (limited to 'Assistant/Threads/Watcher.hs')
-rw-r--r-- | Assistant/Threads/Watcher.hs | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Assistant/Threads/Watcher.hs b/Assistant/Threads/Watcher.hs index 8d155ecb1..7dcde1f46 100644 --- a/Assistant/Threads/Watcher.hs +++ b/Assistant/Threads/Watcher.hs @@ -85,9 +85,7 @@ startupScan scanner = do inRepo $ Git.Command.run "add" [Param "--update"] showAction "started" - dstatus <- getAssistant daemonStatusHandle - liftIO $ modifyDaemonStatus_ dstatus $ - \s -> s { scanComplete = True } + modifyDaemonStatus_ $ \s -> s { scanComplete = True } return (True, r) @@ -218,8 +216,7 @@ onDelDir dir _ = do onErr :: Handler onErr msg _ = do liftAnnex $ warning msg - dstatus <- getAssistant daemonStatusHandle - void $ liftIO $ addAlert dstatus $ warningAlert "watcher" msg + void $ addAlert $ warningAlert "watcher" msg noChange {- Adds a symlink to the index, without ever accessing the actual symlink |