diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-07-28 18:02:11 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-07-28 18:02:11 -0400 |
| commit | 3cc18857936e5a09e033439971dc9c43e6ccbaa2 (patch) | |
| tree | a817de04aa65271b3036370d447cf1b228a4bffb /Assistant/TransferQueue.hs | |
| parent | a17fde22fabdb706086ac945bc331e32527b58bd (diff) | |
move DaemonStatus manipulation out of the Annex monad to IO
I've convinced myself that nothing in DaemonStatus can deadlock,
as it always keepts the TMVar full. That was the only reason it was in the
Annex monad.
Diffstat (limited to 'Assistant/TransferQueue.hs')
| -rw-r--r-- | Assistant/TransferQueue.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Assistant/TransferQueue.hs b/Assistant/TransferQueue.hs index 414a1f9be..2f09813eb 100644 --- a/Assistant/TransferQueue.hs +++ b/Assistant/TransferQueue.hs @@ -59,7 +59,7 @@ stubInfo f r = TransferInfo {- Adds transfers to queue for some of the known remotes. -} queueTransfers :: Schedule -> TransferQueue -> DaemonStatusHandle -> Key -> AssociatedFile -> Direction -> Annex () queueTransfers schedule q daemonstatus k f direction = do - rs <- knownRemotes <$> getDaemonStatus daemonstatus + rs <- knownRemotes <$> liftIO (getDaemonStatus daemonstatus) mapM_ go =<< sufficientremotes rs where sufficientremotes rs |