Merge lp:~kangol/bzr/1.8-smart-server-fix into lp:~bzr/bzr/trunk-old

Proposed by Christophe Simonis (OpenERP) on 2008-10-28
Status: Rejected
Rejected by: Martin Pool on 2009-06-16
Proposed branch: lp:~kangol/bzr/1.8-smart-server-fix
Merge into: lp:~bzr/bzr/trunk-old
Diff against target: 12 lines
To merge this branch: bzr merge lp:~kangol/bzr/1.8-smart-server-fix
Reviewer Review Type Date Requested Status
Robert Collins (community) 2008-10-28 Resubmit on 2009-05-06
Review via email: mp+1443@code.launchpad.net
To post a comment you must log in.
Robert Collins (lifeless) wrote :

self._sockname should be a tuple (hostname, port) - what are you seeing it being?

Sorry that this took so long to get to, we were using a different review system.

review: Resubmit
Martin Pool (mbp) wrote :

Is there a bug report for this?

Unmerged revisions

3767. By Christophe Simonis (OpenERP) on 2008-10-28

bugfix smart server

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bzrlib/smart/server.py'
2--- bzrlib/smart/server.py 2009-03-23 14:59:43 +0000
3+++ bzrlib/smart/server.py 2009-03-24 21:35:42 +0000
4@@ -148,7 +148,7 @@
5
6 def get_url(self):
7 """Return the url of the server"""
8- return "bzr://%s:%d/" % self._sockname
9+ return "bzr://%s:%d/" % (self._sockname, self.port)
10
11 def serve_conn(self, conn, thread_name_suffix):
12 # For WIN32, where the timeout value from the listening socket