assistant: Fix syncing after XMPP pairing.

A missing uuid broke this, and also caused a UI glitch in the webapp's
remote list.
This commit is contained in:
Joey Hess 2013-03-06 22:18:44 -04:00
parent f8c2dc82d8
commit 57b601e384
2 changed files with 7 additions and 1 deletions

View file

@ -25,6 +25,8 @@ import Git
import qualified Git.Branch
import Locations.UserConfig
import qualified Types.Remote as Remote
import qualified Remote as Remote
import Remote.List
import Utility.FileMode
import Utility.Shell
@ -53,7 +55,10 @@ makeXMPPGitRemote buddyname jid u = do
remote <- liftAnnex $ addRemote $
makeGitRemote buddyname $ gitXMPPLocation jid
liftAnnex $ storeUUID (remoteConfig (Remote.repo remote) "uuid") u
syncNewRemote remote
liftAnnex $ void remoteListRefresh
remote' <- liftAnnex $ fromMaybe (error "failed to add remote")
<$> Remote.byName (Just buddyname)
syncNewRemote remote'
return True
{- Pushes over XMPP, communicating with a specific client.

1
debian/changelog vendored
View file

@ -29,6 +29,7 @@ git-annex (4.20130228) UNRELEASED; urgency=low
and on startup.
* assistant: XMPP git pull and push requests are cached and sent when
presence of a new client is detected.
* assistant: Fix syncing after XMPP pairing.
-- Joey Hess <joeyh@debian.org> Wed, 27 Feb 2013 23:20:40 -0400