From 53a0823e7a9c2f0485d052f99f30ebbbf744ed3c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 17 Mar 2013 15:59:03 -0400 Subject: assistant: Avoid syncing with annex-ignored remotes when reconnecting to the network, or connecting a drive. --- Assistant/Threads/MountWatcher.hs | 2 +- Assistant/Threads/NetWatcher.hs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'Assistant/Threads') diff --git a/Assistant/Threads/MountWatcher.hs b/Assistant/Threads/MountWatcher.hs index 143ae9cee..c03eac4f1 100644 --- a/Assistant/Threads/MountWatcher.hs +++ b/Assistant/Threads/MountWatcher.hs @@ -157,7 +157,7 @@ handleMount :: FilePath -> Assistant () handleMount dir = do debug ["detected mount of", dir] rs <- filter (Git.repoIsLocal . Remote.repo) <$> remotesUnder dir - reconnectRemotes True rs + reconnectRemotes True $ filter (not . remoteAnnexIgnore . Remote.gitconfig) rs {- Finds remotes located underneath the mount point. - diff --git a/Assistant/Threads/NetWatcher.hs b/Assistant/Threads/NetWatcher.hs index 6ac7203b0..6d15d414e 100644 --- a/Assistant/Threads/NetWatcher.hs +++ b/Assistant/Threads/NetWatcher.hs @@ -128,4 +128,4 @@ handleConnection = reconnectRemotes True =<< networkRemotes {- Finds network remotes. -} networkRemotes :: Assistant [Remote] networkRemotes = liftAnnex $ - filter (isNothing . Remote.localpath) <$> remoteList + filter (isNothing . Remote.localpath) <$> enabledRemoteList -- cgit v1.2.3