summaryrefslogtreecommitdiff
path: root/Assistant/Threads/Watcher.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-10-29 16:49:47 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-10-29 16:49:47 -0400
commit2960a8011484fa3dad1cff55e8e412f4d4b1db84 (patch)
treec36b30274a014f5a7d22dd072a3756a9d4b817cc /Assistant/Threads/Watcher.hs
parent0864097c212131b477b41907b3d59dacf6bc4fe9 (diff)
lift alertWhile
Diffstat (limited to 'Assistant/Threads/Watcher.hs')
-rw-r--r--Assistant/Threads/Watcher.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/Assistant/Threads/Watcher.hs b/Assistant/Threads/Watcher.hs
index 172b7976e..1c796a521 100644
--- a/Assistant/Threads/Watcher.hs
+++ b/Assistant/Threads/Watcher.hs
@@ -75,8 +75,7 @@ watchThread = NamedThread "Watcher" $ do
startupScan :: IO a -> Assistant a
startupScan scanner = do
liftAnnex $ showAction "scanning"
- dstatus <- getAssistant daemonStatusHandle
- alertWhile' dstatus startupScanAlert <~> do
+ alertWhile' startupScanAlert $ do
r <- liftIO $ scanner
-- Notice any files that were deleted before
@@ -85,6 +84,7 @@ startupScan scanner = do
inRepo $ Git.Command.run "add" [Param "--update"]
showAction "started"
+ dstatus <- getAssistant daemonStatusHandle
liftIO $ modifyDaemonStatus_ dstatus $
\s -> s { scanComplete = True }