diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-06-01 17:49:37 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-06-01 17:57:31 -0400 |
| commit | a8fb97d2ce8e75b36b8e1572a83efd341e67d43e (patch) | |
| tree | ab24a8af581281ff8b006309acfb4000317ad072 /Command | |
| parent | 7a3d9d8c2e2bd53d0d4290e99186c6e37f18456d (diff) | |
Add --trust, --untrust, and --semitrust options.
Diffstat (limited to 'Command')
| -rw-r--r-- | Command/Move.hs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Command/Move.hs b/Command/Move.hs index f49fe20e0..6a23aee92 100644 --- a/Command/Move.hs +++ b/Command/Move.hs @@ -16,6 +16,7 @@ import LocationLog import Types import Content import qualified Remote +import qualified RemoteUtils import UUID import Messages @@ -89,7 +90,7 @@ toPerform dest move key = do let fastcheck = fast && not move && not (Remote.hasKeyCheap dest) isthere <- if fastcheck then do - (remotes, _) <- Remote.keyPossibilities key + (remotes, _) <- RemoteUtils.keyPossibilities key return $ Right $ dest `elem` remotes else Remote.hasKey dest key case isthere of @@ -123,7 +124,7 @@ fromStart :: Remote.Remote Annex -> Bool -> CommandStartString fromStart src move file = isAnnexed file $ \(key, _) -> do g <- Annex.gitRepo u <- getUUID g - (remotes, _) <- Remote.keyPossibilities key + (remotes, _) <- RemoteUtils.keyPossibilities key if (u == Remote.uuid src) || (null $ filter (== src) remotes) then stop else do |