From 5aca7af2f702aa508ec5949e1fddbee429a93db5 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 9 Oct 2012 12:18:41 -0400 Subject: assistant: Now honors preferred content settings when deciding what to transfer. Both when queueing downloads, and uploads, consults the preferred content settings. I didn't make it check yet when requeing failed transfers or queuing deferred downloads; dealing with the preferred content settings (or indeed, other settings) changing while the assistant is running still needs work. --- Assistant/Threads/Committer.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Assistant/Threads/Committer.hs') diff --git a/Assistant/Threads/Committer.hs b/Assistant/Threads/Committer.hs index 6b036d09a..b791dcc82 100644 --- a/Assistant/Threads/Committer.hs +++ b/Assistant/Threads/Committer.hs @@ -210,7 +210,7 @@ handleAdds delayadd st changechan transferqueue dstatus cs = returnWhen (null in sha <- inRepo $ Git.HashObject.hashObject BlobObject link stageSymlink file sha - queueTransfers Next transferqueue dstatus key (Just file) Upload + queueTransfers Next transferqueue dstatus st key (Just file) Upload showEndOk return $ Just change -- cgit v1.2.3