diff options
author | 2013-03-31 18:39:49 -0400 | |
---|---|---|
committer | 2013-03-31 18:39:49 -0400 | |
commit | 034daa7b987f479a2b3557018af47df6ee6ee37a (patch) | |
tree | 779c8ce378e259122bcb1011ed4324e5e9e21985 | |
parent | 2fd64b0831cb3bb9366ba6a887ddfa3bdf119b5e (diff) |
fix dropping files from untrusted repositories
An off-by-one prevented the assistant ever dropping files from untrusted
repositories.
-rw-r--r-- | Assistant/Drop.hs | 30 |
1 files changed, 22 insertions, 8 deletions
diff --git a/Assistant/Drop.hs b/Assistant/Drop.hs index 4c060ba31..1d22da466 100644 --- a/Assistant/Drop.hs +++ b/Assistant/Drop.hs @@ -41,25 +41,39 @@ handleDropsFrom _ _ _ _ _ Nothing _ = noop handleDropsFrom locs rs reason fromhere key (Just f) knownpresentremote | fromhere = do n <- getcopies - if checkcopies n + if checkcopies n Nothing then go rs =<< dropl n else go rs n | otherwise = go rs =<< getcopies where getcopies = liftAnnex $ do - have <- length <$> trustExclude UnTrusted locs + (untrusted, have) <- trustPartition UnTrusted locs numcopies <- getNumCopies =<< numCopies f - return (have, numcopies) - checkcopies (have, numcopies) = have > numcopies - decrcopies (have, numcopies) = (have - 1, numcopies) + return (length have, numcopies, S.fromList untrusted) + + {- Check that we have enough copies still to drop the content. + - When the remote being dropped from is untrusted, it was not + - counted as a copy, so having only numcopies suffices. Otherwise, + - we need more than numcopies to safely drop. -} + checkcopies (have, numcopies, _untrusted) Nothing = have > numcopies + checkcopies (have, numcopies, untrusted) (Just u) + | S.member u untrusted = have >= numcopies + | otherwise = have > numcopies + + decrcopies (have, numcopies, untrusted) Nothing = + (have - 1, numcopies, untrusted) + decrcopies v@(_have, _numcopies, untrusted) (Just u) + | S.member u untrusted = v + | otherwise = decrcopies v Nothing go [] _ = noop go (r:rest) n | uuid r `S.notMember` slocs = go rest n - | checkcopies n = dropr r n >>= go rest + | checkcopies n (Just $ Remote.uuid r) = + dropr r n >>= go rest | otherwise = noop - checkdrop n@(have, numcopies) u a = + checkdrop n@(have, numcopies, _untrusted) u a = ifM (liftAnnex $ wantDrop True u (Just f)) ( ifM (liftAnnex $ safely $ doCommand $ a (Just numcopies)) ( do @@ -70,7 +84,7 @@ handleDropsFrom locs rs reason fromhere key (Just f) knownpresentremote , "(copies now " ++ show (have - 1) ++ ")" , ": " ++ reason ] - return $ decrcopies n + return $ decrcopies n u , return n ) , return n |