summaryrefslogtreecommitdiff
path: root/Assistant.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-07-06 16:39:07 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-07-06 16:41:37 -0400
commit430ad8ce85835e002a326b68813c51f85c91141e (patch)
treea22295b05a4c49e5cb483ec2b49df170b59c4cd8 /Assistant.hs
parent8795a392c3f283d8e372cac3d82d29ca52c9cfb5 (diff)
it builds again
Currently nothing waits on transfer processes. (Second drive of the day fried. Not concentrating very well.)
Diffstat (limited to 'Assistant.hs')
-rw-r--r--Assistant.hs3
1 files changed, 2 insertions, 1 deletions
diff --git a/Assistant.hs b/Assistant.hs
index 38ed539a1..06484b086 100644
--- a/Assistant.hs
+++ b/Assistant.hs
@@ -84,6 +84,7 @@ import Assistant.Changes
import Assistant.Commits
import Assistant.Pushes
import Assistant.TransferQueue
+import Assistant.TransferSlots
import Assistant.Threads.Watcher
import Assistant.Threads.Committer
import Assistant.Threads.Pusher
@@ -122,7 +123,7 @@ startDaemon assistant foreground
, pushThread st dstatus commitchan pushmap
, pushRetryThread st pushmap
, mergeThread st
- , transferWatcherThread st dstatus transferslots
+ , transferWatcherThread st dstatus
, transfererThread st dstatus transferqueue transferslots
, daemonStatusThread st dstatus
, sanityCheckerThread st dstatus transferqueue changechan