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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue