avoid syncing remotes configured annex-ignore, unless explicitly specified

1 files changed, 6 insertions, 1 deletions

diff --git a/Remote.hs b/Remote.hs
index 643ba2d0d..94c301192 100644
--- a/Remote.hs
+++ b/Remote.hs
@@ -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)