assistant: Fix NetWatcher to not sync with remotes that have remote.<name>.annex-sync set to false.
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:
parent
c902e3c133
commit
97f3aecb17
3 changed files with 10 additions and 4 deletions
|
@ -13,8 +13,8 @@ module Assistant.Threads.NetWatcher where
|
|||
import Assistant.Common
|
||||
import Assistant.Sync
|
||||
import Utility.ThreadScheduler
|
||||
import Remote.List
|
||||
import qualified Types.Remote as Remote
|
||||
import Assistant.DaemonStatus
|
||||
|
||||
#if WITH_DBUS
|
||||
import Utility.DBus
|
||||
|
@ -125,7 +125,7 @@ listenWicdConnections client callback =
|
|||
handleConnection :: Assistant ()
|
||||
handleConnection = reconnectRemotes True =<< networkRemotes
|
||||
|
||||
{- Finds network remotes. -}
|
||||
{- Network remotes to sync with. -}
|
||||
networkRemotes :: Assistant [Remote]
|
||||
networkRemotes = liftAnnex $
|
||||
filter (isNothing . Remote.localpath) <$> remoteList
|
||||
networkRemotes = filter (isNothing . Remote.localpath) . syncRemotes
|
||||
<$> getDaemonStatus
|
||||
|
|
2
debian/changelog
vendored
2
debian/changelog
vendored
|
@ -15,6 +15,8 @@ git-annex (4.20130724) UNRELEASED; urgency=low
|
|||
gpg.
|
||||
* unused: No longer shows as unused tmp files that are actively being
|
||||
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
|
||||
|
||||
|
|
|
@ -27,3 +27,7 @@ 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]]
|
||||
|
|
Loading…
Reference in a new issue