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

assistant: Fix NetWatcher to not sync with remotes that have remote.<name>.annex-sync set to false.

Browse source 
This affected both the hourly NetWatcherFallback thread and the syncing
when network connection is detected.

It was a reversion of sorts, introduced in
8861e270be, when annex-ignore was changed to
not control git syncing. I forgot to make it check annex-sync at that
point.
This commit is contained in:
Joey Hess 2013-07-26 16:53:50 -04:00
parent c902e3c133
commit 97f3aecb17
3 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Assistant/Threads/NetWatcher.hs
View file

@ -13,8 +13,8 @@ module Assistant.Threads.NetWatcher where
import Assistant.Common import Assistant.Common
import Assistant.Sync import Assistant.Sync
import Utility.ThreadScheduler import Utility.ThreadScheduler
import Remote.List
import qualified Types.Remote as Remote import qualified Types.Remote as Remote
import Assistant.DaemonStatus
#if WITH_DBUS #if WITH_DBUS
import Utility.DBus import Utility.DBus
@ -125,7 +125,7 @@ listenWicdConnections client callback =
handleConnection :: Assistant () handleConnection :: Assistant ()
handleConnection = reconnectRemotes True =<< networkRemotes handleConnection = reconnectRemotes True =<< networkRemotes
{- Finds network remotes. -} {- Network remotes to sync with. -}
networkRemotes :: Assistant [Remote] networkRemotes :: Assistant [Remote]
networkRemotes = liftAnnex $ networkRemotes = filter (isNothing . Remote.localpath) . syncRemotes
filter (isNothing . Remote.localpath) <$> remoteList <$> getDaemonStatus

2
debian/changelog vendored
View file

@ -15,6 +15,8 @@ git-annex (4.20130724) UNRELEASED; urgency=low
gpg. gpg.
* unused: No longer shows as unused tmp files that are actively being * unused: No longer shows as unused tmp files that are actively being
transferred. transferred.
* assistant: Fix NetWatcher to not sync with remotes that have
remote.<name>.annex-sync set to false.
-- Joey Hess <joeyh@debian.org> Tue, 23 Jul 2013 12:39:48 -0400 -- Joey Hess <joeyh@debian.org> Tue, 23 Jul 2013 12:39:48 -0400

4
doc/bugs/assistant_syncs_with_remotes_even_when_all_remotes_disabled.mdwn
View file

@ -27,3 +27,7 @@ Everything up-to-date
Everything up-to-date Everything up-to-date
Everything up-to-date Everything up-to-date
"""]] """]]
> Excellent bug report! Especially useful that you tracked it
> down to the NetWatcher. Indeed it was not honoring the
> annex-sync setting. [[fixed|done]] --[[Joey]]