diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-04-30 14:11:29 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-04-30 14:11:59 -0400 |
| commit | 9751908b69f166ad26183b7d3cdd3b0fb7b3830a (patch) | |
| tree | f66a01c5145ff704cc862dc67c320e95368d8219 | |
| parent | ee8845d48d6e70424a7dd65e45d5d2aaba5edab1 (diff) | |
move nubbing into function whose algo needs a nubbed list
| -rw-r--r-- | Annex/NumCopies.hs | 5 | ||||
| -rw-r--r-- | Command/Drop.hs | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Annex/NumCopies.hs b/Annex/NumCopies.hs index 62cd93883..879513927 100644 --- a/Annex/NumCopies.hs +++ b/Annex/NumCopies.hs @@ -99,7 +99,8 @@ verifyEnoughCopies -> [UUID] -- repos that are trusted or already verified to have it -> [Remote] -- remotes to check to see if they have it -> Annex Bool -verifyEnoughCopies nolocmsg key need skip = helper [] [] +verifyEnoughCopies nolocmsg key need skip trusted tocheck = + helper [] [] (nub trusted) (nub tocheck) where helper bad missing have [] | NumCopies (length have) >= need = return True @@ -140,7 +141,7 @@ knownCopies key = do (remotes, trusteduuids) <- Remote.keyPossibilitiesTrusted key u <- getUUID trusteduuids' <- ifM (inAnnex key <&&> (<= SemiTrusted) <$> lookupTrust u) - ( pure (nub (u:trusteduuids)) + ( pure (u:trusteduuids) , pure trusteduuids ) return (remotes, trusteduuids') diff --git a/Command/Drop.hs b/Command/Drop.hs index a1362ca84..a3ac87633 100644 --- a/Command/Drop.hs +++ b/Command/Drop.hs @@ -72,7 +72,7 @@ performLocal key afile numcopies knownpresentremote = lockContent key $ \content (remotes, trusteduuids) <- Remote.keyPossibilitiesTrusted key let trusteduuids' = case knownpresentremote of Nothing -> trusteduuids - Just r -> nub (Remote.uuid r:trusteduuids) + Just r -> Remote.uuid r:trusteduuids untrusteduuids <- trustGet UnTrusted let tocheck = Remote.remotesWithoutUUID remotes (trusteduuids'++untrusteduuids) u <- getUUID |