summaryrefslogtreecommitdiff
path: root/Limit.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-01-10 13:11:16 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-01-10 13:32:38 -0400
commit07cacbeee95b377e1bf4111e4d4b30190956c585 (patch)
tree17249f177a6ffde3d2f524ee66a9a6b2530bd92e /Limit.hs
parent0d5c4022105a393a4eac76b09940f8b22fa0a56c (diff)
break module dependancy loop
A PITA but worth it to clean up the trust configuration code.
Diffstat (limited to 'Limit.hs')
-rw-r--r--Limit.hs5
1 files changed, 2 insertions, 3 deletions
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. -}