diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-11-11 00:26:29 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-11-11 00:26:29 -0400 |
| commit | d9f5cc9f73ea046fcd2b59b5e75d4600593ac05b (patch) | |
| tree | e692b07c2a474bb48481e42474a1af3a5e57e22c | |
| parent | 1062d35cf793718617561bb112ffbc61de8a6801 (diff) | |
use trustExclude
| -rw-r--r-- | Assistant/DaemonStatus.hs | 2 | ||||
| -rw-r--r-- | Assistant/Drop.hs | 2 | ||||
| -rw-r--r-- | Remote.hs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Assistant/DaemonStatus.hs b/Assistant/DaemonStatus.hs index 5e1ecab3c..a93f4105a 100644 --- a/Assistant/DaemonStatus.hs +++ b/Assistant/DaemonStatus.hs @@ -46,7 +46,7 @@ calcSyncRemotes :: Annex [Remote] calcSyncRemotes = do rs <- filterM (repoSyncable . Remote.repo) =<< concat . Remote.byCost <$> Remote.enabledRemoteList - alive <- snd <$> trustPartition DeadTrusted (map Remote.uuid rs) + alive <- trustExclude DeadTrusted (map Remote.uuid rs) let good r = Remote.uuid r `elem` alive return $ filter good rs diff --git a/Assistant/Drop.hs b/Assistant/Drop.hs index a02f58652..d28a05a53 100644 --- a/Assistant/Drop.hs +++ b/Assistant/Drop.hs @@ -39,7 +39,7 @@ handleDrops' locs rs fromhere key (Just f) | otherwise = go rs =<< getcopies where getcopies = do - have <- length . snd <$> trustPartition UnTrusted locs + have <- length <$> trustExclude UnTrusted locs numcopies <- getNumCopies =<< numCopies f return (have, numcopies) checkcopies (have, numcopies) = have > numcopies @@ -169,7 +169,7 @@ remotesWithoutUUID rs us = filter (\r -> uuid r `notElem` us) rs {- List of repository UUIDs that the location log indicates may have a key. - Dead repositories are excluded. -} keyLocations :: Key -> Annex [UUID] -keyLocations key = snd <$> (trustPartition DeadTrusted =<< loggedLocations key) +keyLocations key = trustExclude DeadTrusted =<< loggedLocations key {- Cost ordered lists of remotes that the location log indicates - may have a key. |