diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-11-10 14:38:50 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-11-10 14:38:50 -0400 |
| commit | 3ff1d41a1be38ab8e239b23f590b3f0c96e9ce8b (patch) | |
| tree | a056d769646f2bc6e20a203200647d0507b05ccf /Assistant/XMPP.hs | |
| parent | 5ebfd2c11131fe9feca67d932d3bde0ebb20e2b7 (diff) | |
full-on git-annex assistant syncing now works over XMPP!
I decided to use the fallback push mode from the beginning for XMPP, since
while it uses some ugly branches, it avoids the possibility of a normal
push failing, and needing to pull and re-push. Due to the overhead of XMPP,
and the difficulty of building such a chain of actions due to the async
implementation, this seemed reasonable.
It seems to work great!
Diffstat (limited to 'Assistant/XMPP.hs')
| -rw-r--r-- | Assistant/XMPP.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Assistant/XMPP.hs b/Assistant/XMPP.hs index d31712770..e473b5305 100644 --- a/Assistant/XMPP.hs +++ b/Assistant/XMPP.hs @@ -167,8 +167,8 @@ decodeMessage m = decode =<< gitAnnexTagInfo m fmap (ReceivePackDone . decodeExitCode) . readish . T.unpack . tagValue ] - pushdecoder a m i = Pushing - <$> (formatJID <$> messageFrom m) + pushdecoder a m' i = Pushing + <$> (formatJID <$> messageFrom m') <*> a i decodeExitCode :: Int -> ExitCode |