From 364b40e5fcad5e6221df75b49953c838407a4546 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 24 Sep 2012 13:16:08 -0400 Subject: [PATCH] don't queue uploads for failed downloads --- Assistant/Threads/TransferWatcher.hs | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Assistant/Threads/TransferWatcher.hs b/Assistant/Threads/TransferWatcher.hs index d4ff9176e9..33f0dacbe6 100644 --- a/Assistant/Threads/TransferWatcher.hs +++ b/Assistant/Threads/TransferWatcher.hs @@ -11,6 +11,7 @@ import Assistant.Common import Assistant.ThreadedMonad import Assistant.DaemonStatus import Assistant.TransferQueue +import Annex.Content import Logs.Transfer import Utility.DirWatcher import Utility.Types.DirWatcher @@ -106,11 +107,11 @@ onDel st dstatus transferqueue file _ = case parseTransferFile file of - spreading them out to other reachable remotes. -} case (minfo, transferDirection t) of (Just info, Download) -> runThreadState st $ - queueTransfersMatching - (/= transferUUID t) - Later transferqueue dstatus - (transferKey t) - (associatedFile info) - Upload + whenM (inAnnex $ transferKey t) $ + queueTransfersMatching + (/= transferUUID t) + Later transferqueue dstatus + (transferKey t) + (associatedFile info) + Upload _ -> noop -