diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-06-01 19:10:38 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-06-01 19:11:27 -0400 |
| commit | 971ab27e7820a3228f71dd42f3e870c0fc2f4345 (patch) | |
| tree | f54a3fed5d3a161c5e6caff8954002f830ec8eed /Command/Move.hs | |
| parent | 80efafe4960e0fb33d1e6783bd34eaf459febea1 (diff) | |
better types allowed breaking module dep loop
Diffstat (limited to 'Command/Move.hs')
| -rw-r--r-- | Command/Move.hs | 5 |
1 files changed, 2 insertions, 3 deletions
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 |