diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-03-06 22:18:44 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-03-06 22:18:44 -0400 |
| commit | 406b650a1ca2b0f097366ebcede42c8a646df8df (patch) | |
| tree | 8be6978f0b1b0ac74c8b59cb2b7012e720505d60 | |
| parent | 82a9a3bd5c5cc15323e0f7c3a56ed3df46b8d19a (diff) | |
assistant: Fix syncing after XMPP pairing.
A missing uuid broke this, and also caused a UI glitch in the webapp's
remote list.
| -rw-r--r-- | Assistant/XMPP/Git.hs | 7 | ||||
| -rw-r--r-- | debian/changelog | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/Assistant/XMPP/Git.hs b/Assistant/XMPP/Git.hs index bdb68eea1..0a452154b 100644 --- a/Assistant/XMPP/Git.hs +++ b/Assistant/XMPP/Git.hs @@ -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. diff --git a/debian/changelog b/debian/changelog index 26d4fc76b..2facb33a0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 |