move partitioning out of keyPossibilities

And a bug fix in passing.
This commit is contained in:
Joey Hess 2011-01-26 16:44:14 -04:00
parent 7f6af79232
commit b7903eb2d1
4 changed files with 11 additions and 19 deletions

View file

@ -110,8 +110,8 @@ toCleanup dest move key = do
fromStart :: Git.Repo -> Bool -> CommandStartString
fromStart src move file = isAnnexed file $ \(key, _) -> do
g <- Annex.gitRepo
(trusted, untrusted, _) <- Remotes.keyPossibilities key
if (g == src) || (null $ filter (\r -> Remotes.same r src) (trusted ++ untrusted))
(remotes, _) <- Remotes.keyPossibilities key
if (g == src) || (null $ filter (\r -> Remotes.same r src) remotes)
then return Nothing
else do
showAction move file