break module dependancy loop

A PITA but worth it to clean up the trust configuration code.
This commit is contained in:
Joey Hess 2012-01-10 13:11:16 -04:00
parent 0d5c402210
commit 07cacbeee9
10 changed files with 109 additions and 107 deletions

View file

@ -93,7 +93,7 @@ verifyLocationLog key desc = do
preventWrite (parentDir f)
u <- getUUID
uuids <- keyLocations key
uuids <- Remote.keyLocations key
case (present, u `elem` uuids) of
(True, False) -> do
@ -142,7 +142,7 @@ checkBackend = Types.Backend.fsckKey
checkKeyNumCopies :: Key -> FilePath -> Maybe Int -> Annex Bool
checkKeyNumCopies key file numcopies = do
needed <- getNumCopies numcopies
(untrustedlocations, safelocations) <- trustPartition UnTrusted =<< keyLocations key
(untrustedlocations, safelocations) <- trustPartition UnTrusted =<< Remote.keyLocations key
let present = length safelocations
if present < needed
then do

View file

@ -8,7 +8,6 @@
module Command.Whereis where
import Common.Annex
import Logs.Location
import Command
import Remote
import Logs.Trust