better dup key with -J fix
This avoids all the complication about redundant work discussed in the previous try at fixing this. At the expense of needing each command that could have the problem to be patched to simply wrap the action in onlyActionOn once the key is known. But there do not seem to be many such commands. onlyActionOn' should not be used with a CommandStart (or CommandPerform), although the types do allow it. onlyActionOn handles running the whole CommandStart chain. I couldn't immediately see a way to avoid mistken use of onlyActionOn'. This commit was supported by the NSF-funded DataLad project.
This commit is contained in:
parent
68a49adcda
commit
e1ac299ad0
16 changed files with 82 additions and 77 deletions
|
@ -609,7 +609,7 @@ seekSyncContent o rs = do
|
|||
- Returns True if any file transfers were made.
|
||||
-}
|
||||
syncFile :: Either (Maybe (Bloom Key)) (Key -> Annex ()) -> [Remote] -> AssociatedFile -> Key -> Annex Bool
|
||||
syncFile ebloom rs af k = do
|
||||
syncFile ebloom rs af k = onlyActionOn' k $ do
|
||||
locs <- Remote.keyLocations k
|
||||
let (have, lack) = partition (\r -> Remote.uuid r `elem` locs) rs
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue