mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

assistant: Avoid syncing with annex-ignored remotes when reconnecting to the network, or connecting a drive.

Browse source
This commit is contained in:
Joey Hess 2013-03-17 15:59:03 -04:00
parent 69cc00c5fc
commit 746ffa773a
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Assistant/Threads/MountWatcher.hs
View file

@ -157,7 +157,7 @@ handleMount :: FilePath -> Assistant ()
handleMount dir = do handleMount dir = do
debug ["detected mount of", dir] debug ["detected mount of", dir]
rs <- filter (Git.repoIsLocal . Remote.repo) <$> remotesUnder 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. {- Finds remotes located underneath the mount point.
- -

2
Assistant/Threads/NetWatcher.hs
View file

@ -128,4 +128,4 @@ handleConnection = reconnectRemotes True =<< networkRemotes
{- Finds network remotes. -} {- Finds network remotes. -}
networkRemotes :: Assistant [Remote] networkRemotes :: Assistant [Remote]
networkRemotes = liftAnnex $ networkRemotes = liftAnnex $
filter (isNothing . Remote.localpath) <$> remoteList filter (isNothing . Remote.localpath) <$> enabledRemoteList

2
debian/changelog vendored
View file

@ -17,6 +17,8 @@ git-annex (4.20130315) UNRELEASED; urgency=low
* map: Combine duplicate repositories, for a nicer looking map. * map: Combine duplicate repositories, for a nicer looking map.
* Fix several bugs caused by a bad Ord instance for Remote. * Fix several bugs caused by a bad Ord instance for Remote.
* webapp: Switch all forms to POST. * 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 -- Joey Hess <joeyh@debian.org> Fri, 15 Mar 2013 00:10:07 -0400