diff options
author | Joey Hess <joey@kitenet.net> | 2012-10-09 12:18:41 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2012-10-09 12:18:41 -0400 |
commit | 5aca7af2f702aa508ec5949e1fddbee429a93db5 (patch) | |
tree | f941ab8fc820ced727c3e5a024d1e0ec0cfcb559 /Assistant/Threads/Committer.hs | |
parent | a7d8c4101c4cc476323ce0fca372b01198167773 (diff) |
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.
Diffstat (limited to 'Assistant/Threads/Committer.hs')
-rw-r--r-- | Assistant/Threads/Committer.hs | 2 |
1 files changed, 1 insertions, 1 deletions
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 |