diff options
author | Joey Hess <joey@kitenet.net> | 2011-12-31 01:42:42 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2011-12-31 01:42:42 -0400 |
commit | 015a497914d0614afff705d5f9acd79d956740ec (patch) | |
tree | 8d1d4199a0b5aba1264fda1285d7433335e6f1d5 /Remote.hs | |
parent | e7d3e546c298add0a39ec1a979d9b1574b9b9b76 (diff) |
avoid syncing remotes configured annex-ignore, unless explicitly specified
Diffstat (limited to 'Remote.hs')
-rw-r--r-- | Remote.hs | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -17,6 +17,7 @@ module Remote ( remoteTypes, remoteList, + enabledRemoteList, remoteMap, byName, prettyPrintUUIDs, @@ -85,6 +86,10 @@ remoteList = do u <- getRepoUUID r generate t r u (M.lookup u m) +{- All remotes that are not ignored. -} +enabledRemoteList :: Annex [Remote Annex] +enabledRemoteList = filterM (repoNotIgnored . repo) =<< remoteList + {- Map of UUIDs of Remotes and their names. -} remoteMap :: Annex (M.Map UUID String) remoteMap = M.fromList . map (\r -> (uuid r, name r)) <$> remoteList @@ -196,7 +201,7 @@ keyPossibilities' withtrusted key = do let validtrusteduuids = validuuids `intersect` trusted -- remotes that match uuids that have the key - allremotes <- filterM (repoNotIgnored . repo) =<< remoteList + allremotes <- enabledRemoteList let validremotes = remotesWithUUID allremotes validuuids return (sort validremotes, validtrusteduuids) |