diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-02-01 10:33:55 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-02-01 10:33:55 -0400 |
| commit | 6f622c6043ad8db9f27a16020c371af68506e8e7 (patch) | |
| tree | ff3ac9ebc96979f98220dc15ca7356c3a0906022 /Assistant/Threads/XMPPClient.hs | |
| parent | cf46308597d8633cc7bad9687f7f0baf91e14992 (diff) | |
improve sync with xmpp and annex-ignore
* sync --content: Honor annex-ignore configuration.
* sync: Don't try to sync with xmpp remotes, which are only currently
supported when using the assistant.
Diffstat (limited to 'Assistant/Threads/XMPPClient.hs')
| -rw-r--r-- | Assistant/Threads/XMPPClient.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Assistant/Threads/XMPPClient.hs b/Assistant/Threads/XMPPClient.hs index 8eb469939..ab4de9257 100644 --- a/Assistant/Threads/XMPPClient.hs +++ b/Assistant/Threads/XMPPClient.hs @@ -322,7 +322,7 @@ pairMsgReceived urlrenderer PairReq theiruuid selfjid theirjid | baseJID selfjid == baseJID theirjid = autoaccept | otherwise = do knownjids <- mapMaybe (parseJID . getXMPPClientID) - . filter isXMPPRemote . syncRemotes <$> getDaemonStatus + . filter Remote.isXMPPRemote . syncRemotes <$> getDaemonStatus um <- liftAnnex uuidMap if elem (baseJID theirjid) knownjids && M.member theiruuid um then autoaccept |