diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-03-01 16:46:36 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-03-01 16:46:36 -0400 |
| commit | 56249c26a6b1160de9f72e5fe5074c59528bfa8f (patch) | |
| tree | bb378d92dda817d0cc1002d6e3d2d0bbcff2fd17 | |
| parent | aa3b4e0c23c77e14dbc31c28a183113442417b84 (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.
| -rw-r--r-- | Assistant/Threads/Transferrer.hs | 2 | ||||
| -rw-r--r-- | debian/changelog | 2 |
2 files changed, 4 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 diff --git a/debian/changelog b/debian/changelog index 1d87d65b6..a437c6ebc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ git-annex (4.20130228) UNRELEASED; urgency=low * assistant: Logs are rotated to avoid them using too much disk space. * assistant: Avoid noise in logs from git commit about typechanged files in direct mode repositories. + * assistant: Fix dropping content when a file is moved to an archive + directory. -- Joey Hess <joeyh@debian.org> Wed, 27 Feb 2013 23:20:40 -0400 |