From 971ab27e7820a3228f71dd42f3e870c0fc2f4345 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 1 Jun 2011 19:10:38 -0400 Subject: better types allowed breaking module dep loop --- Command/Move.hs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'Command/Move.hs') diff --git a/Command/Move.hs b/Command/Move.hs index 6a23aee92..f49fe20e0 100644 --- a/Command/Move.hs +++ b/Command/Move.hs @@ -16,7 +16,6 @@ import LocationLog import Types import Content import qualified Remote -import qualified RemoteUtils import UUID import Messages @@ -90,7 +89,7 @@ toPerform dest move key = do let fastcheck = fast && not move && not (Remote.hasKeyCheap dest) isthere <- if fastcheck then do - (remotes, _) <- RemoteUtils.keyPossibilities key + (remotes, _) <- Remote.keyPossibilities key return $ Right $ dest `elem` remotes else Remote.hasKey dest key case isthere of @@ -124,7 +123,7 @@ fromStart :: Remote.Remote Annex -> Bool -> CommandStartString fromStart src move file = isAnnexed file $ \(key, _) -> do g <- Annex.gitRepo u <- getUUID g - (remotes, _) <- RemoteUtils.keyPossibilities key + (remotes, _) <- Remote.keyPossibilities key if (u == Remote.uuid src) || (null $ filter (== src) remotes) then stop else do -- cgit v1.2.3