diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-03-17 15:59:03 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-03-17 15:59:03 -0400 |
| commit | 53a0823e7a9c2f0485d052f99f30ebbbf744ed3c (patch) | |
| tree | 1e2e99878b59f939b771a8483e8daa840fe28ff9 | |
| parent | 363c117ab4eafdd9ea78351079ca0b642f486c68 (diff) | |
assistant: Avoid syncing with annex-ignored remotes when reconnecting to the network, or connecting a drive.
| -rw-r--r-- | Assistant/Threads/MountWatcher.hs | 2 | ||||
| -rw-r--r-- | Assistant/Threads/NetWatcher.hs | 2 | ||||
| -rw-r--r-- | debian/changelog | 2 |
3 files changed, 4 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 diff --git a/debian/changelog b/debian/changelog index 0df456a87..b79be5309 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,8 @@ git-annex (4.20130315) UNRELEASED; urgency=low * map: Combine duplicate repositories, for a nicer looking map. * Fix several bugs caused by a bad Ord instance for Remote. * webapp: Switch all forms to POST. + * assistant: Avoid syncing with annex-ignored remotes when reconnecting + to the network, or connecting a drive. -- Joey Hess <joeyh@debian.org> Fri, 15 Mar 2013 00:10:07 -0400 |