From 07cacbeee95b377e1bf4111e4d4b30190956c585 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 10 Jan 2012 13:11:16 -0400
Subject: break module dependancy loop

A PITA but worth it to clean up the trust configuration code.
---
 Limit.hs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'Limit.hs')

diff --git a/Limit.hs b/Limit.hs
index 26e5d689c..128ea0a27 100644
--- a/Limit.hs
+++ b/Limit.hs
@@ -15,7 +15,6 @@ import qualified Annex
 import qualified Utility.Matcher
 import qualified Remote
 import qualified Backend
-import Logs.Location
 import Annex.Content
 
 type Limit = Utility.Matcher.Token (FilePath -> Annex Bool)
@@ -78,7 +77,7 @@ addIn name = addLimit $ check $ if name == "." then inAnnex else inremote
 		handle a (Just (key, _)) = a key
 		inremote key = do
 			u <- Remote.nameToUUID name
-			us <- keyLocations key
+			us <- Remote.keyLocations key
 			return $ u `elem` us
 
 {- Adds a limit to skip files not believed to have the specified number
@@ -92,7 +91,7 @@ addCopies num =
 		check n = Backend.lookupFile >=> handle n
 		handle _ Nothing = return False
 		handle n (Just (key, _)) = do
-			us <- keyLocations key
+			us <- Remote.keyLocations key
 			return $ length us >= n
 
 {- Adds a limit to skip files not using a specified key-value backend. -}
-- 
cgit v1.2.3