diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-12-28 12:29:21 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-12-28 12:29:21 -0400 |
| commit | 27a97f6bc3ed88d8e6d75852b55a518843e2d814 (patch) | |
| tree | 72607bd4d78e6673205809d6c36ebeefce71f0e7 | |
| parent | 488fba92256748a23d1cabb20e40063868f27bff (diff) | |
a few last changes post xmpp removal
| -rw-r--r-- | Remote.hs | 2 | ||||
| -rw-r--r-- | doc/todo/dont_append___58__5222_to_jabber_hosts__44___if_a_different_port_has_been_specified_already.mdwn | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -353,7 +353,7 @@ checkAvailable :: Bool -> Remote -> IO Bool checkAvailable assumenetworkavailable = maybe (return assumenetworkavailable) doesDirectoryExist . localpath -{- Remotes using the XMPP transport have urls like xmpp::user@host -} +{- Old remotes using the XMPP transport have urls like xmpp::user@host -} isXMPPRemote :: Remote -> Bool isXMPPRemote remote = Git.repoIsUrl r && "xmpp::" `isPrefixOf` Git.repoLocation r where diff --git a/doc/todo/dont_append___58__5222_to_jabber_hosts__44___if_a_different_port_has_been_specified_already.mdwn b/doc/todo/dont_append___58__5222_to_jabber_hosts__44___if_a_different_port_has_been_specified_already.mdwn index 257054a90..4e3c53e0a 100644 --- a/doc/todo/dont_append___58__5222_to_jabber_hosts__44___if_a_different_port_has_been_specified_already.mdwn +++ b/doc/todo/dont_append___58__5222_to_jabber_hosts__44___if_a_different_port_has_been_specified_already.mdwn @@ -1,2 +1,4 @@ While trying so establish a jabber link via a server that runs a nonstandard port I came across the problem that git-annex always appends :5222 to the jabber server address. This effectively stops the connection procedure at a point where it does not need to. + +> XMPP support has been removed from git-annex, so closing. [[done]] |