aboutsummaryrefslogtreecommitdiff
path: root/Assistant
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-12-22 16:22:28 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-12-22 16:22:28 -0400
commit08f1265886b5cd8646e73f7ed0013b94d34b5f14 (patch)
tree55d6170dafbb39ceda0a73229adc2a5a50722eba /Assistant
parent56d1ad16c61d9e5abe1c123b3f791c9e5f641bd8 (diff)
populate unlocked files with newly available content when ingesting
This can happen when ingesting a new file in either locked or unlocked mode, when some unlocked files in the repo use the same key, and the content was not locally available before.
Diffstat (limited to 'Assistant')
-rw-r--r--Assistant/Threads/Committer.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/Assistant/Threads/Committer.hs b/Assistant/Threads/Committer.hs
index 3e00011f5..c7633d590 100644
--- a/Assistant/Threads/Committer.hs
+++ b/Assistant/Threads/Committer.hs
@@ -347,7 +347,7 @@ handleAdds havelsof delayadd cs = returnWhen (null incomplete) $ do
let source = keySource $ lockedDown change
liftAnnex $ if isdirect
then finishIngestDirect key source
- else Database.Keys.addAssociatedFile key (keyFilename source)
+ else finishIngestUnlocked key source
done change Nothing (keyFilename source) key
removedKeysMap :: Bool -> InodeComparisonType -> [Change] -> Annex (M.Map InodeCacheKey Key)