diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-12-13 00:46:10 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-12-13 00:46:10 -0400 |
| commit | 49a456e8be7fcfdf22554bd2c019da7f9d77ec5f (patch) | |
| tree | 07d3e3ef1d83c374cdfaf6bbd76d7aeb05c5c29c /Assistant/Threads/TransferWatcher.hs | |
| parent | de6406afce6de0cf8a48bc2ecf9be1e7de93e40e (diff) | |
| parent | 7db480af0f944ca0e6c062cd1243c63ad7f878d1 (diff) | |
Merge branch 'master' into desymlink
Diffstat (limited to 'Assistant/Threads/TransferWatcher.hs')
| -rw-r--r-- | Assistant/Threads/TransferWatcher.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Assistant/Threads/TransferWatcher.hs b/Assistant/Threads/TransferWatcher.hs index 6f040ba91..d2f7ebe14 100644 --- a/Assistant/Threads/TransferWatcher.hs +++ b/Assistant/Threads/TransferWatcher.hs @@ -47,7 +47,7 @@ type Handler = FilePath -> Assistant () -} runHandler :: Handler -> FilePath -> Maybe FileStatus -> Assistant () runHandler handler file _filestatus = - either (liftIO . print) (const noop) =<< tryIO <~> handler file + either (liftIO . print) (const noop) =<< tryIO <~> handler file {- Called when there's an error with inotify. -} onErr :: Handler @@ -97,8 +97,8 @@ onDel file = case parseTransferFile file of finished <- asIO2 finishedTransfer void $ liftIO $ forkIO $ do {- XXX race workaround delay. The location - - log needs to be updated before finishedTransfer - - runs. -} + - log needs to be updated before finishedTransfer + - runs. -} threadDelay 10000000 -- 10 seconds finished t minfo |