summaryrefslogtreecommitdiff
path: root/Assistant
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-03-17 15:59:03 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-03-17 15:59:03 -0400
commit53a0823e7a9c2f0485d052f99f30ebbbf744ed3c (patch)
tree1e2e99878b59f939b771a8483e8daa840fe28ff9 /Assistant
parent363c117ab4eafdd9ea78351079ca0b642f486c68 (diff)
assistant: Avoid syncing with annex-ignored remotes when reconnecting to the network, or connecting a drive.
Diffstat (limited to 'Assistant')
-rw-r--r--Assistant/Threads/MountWatcher.hs2
-rw-r--r--Assistant/Threads/NetWatcher.hs2
2 files changed, 2 insertions, 2 deletions
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