aboutsummaryrefslogtreecommitdiff
path: root/Assistant
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-03-01 16:46:36 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-03-01 16:46:36 -0400
commit56249c26a6b1160de9f72e5fe5074c59528bfa8f (patch)
treebb378d92dda817d0cc1002d6e3d2d0bbcff2fd17 /Assistant
parentaa3b4e0c23c77e14dbc31c28a183113442417b84 (diff)
assistant: Fix dropping content when a file is moved to an archive directory.
A transfer is queued, but if the file has already been transferred to the remote before, the transfer is skipped. In this case, it needs to perform any actions it would normally take after finishing the transfer, like dropping the local object.
Diffstat (limited to 'Assistant')
-rw-r--r--Assistant/Threads/Transferrer.hs2
1 files changed, 2 insertions, 0 deletions
diff --git a/Assistant/Threads/Transferrer.hs b/Assistant/Threads/Transferrer.hs
index 575307d24..d8212768a 100644
--- a/Assistant/Threads/Transferrer.hs
+++ b/Assistant/Threads/Transferrer.hs
@@ -20,6 +20,7 @@ import Annex.Content
import qualified Remote
import Types.Key
import Locations.UserConfig
+import Assistant.Threads.TransferWatcher
import System.Process (create_group)
@@ -46,6 +47,7 @@ startTransfer program t info = case (transferRemote info, associatedFile info) o
, do
debug [ "Skipping unnecessary transfer:" , describeTransfer t info ]
void $ removeTransfer t
+ finishedTransfer t (Just info)
return Nothing
)
_ -> return Nothing