Bazaar

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

  1. 1.8-smart-server-fix
  2. Merge into trunk-old
Proposed by Christophe Simonis (OpenERP)
Status: Rejected
Rejected by: Martin Pool
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) Needs Resubmitting
Review via email: mp+1443@code.launchpad.net
To post a comment you must log in.
Revision history for this message
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: Needs Resubmitting
Revision history for this message
Martin Pool (mbp) wrote :

Is there a bug report for this?

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'bzrlib/smart/server.py'
--- bzrlib/smart/server.py 2009-03-23 14:59:43 +0000
+++ bzrlib/smart/server.py 2009-03-24 21:35:42 +0000
@@ -148,7 +148,7 @@
148148
149 def get_url(self):149 def get_url(self):
150 """Return the url of the server"""150 """Return the url of the server"""
151 return "bzr://%s:%d/" % self._sockname151 return "bzr://%s:%d/" % (self._sockname, self.port)
152152
153 def serve_conn(self, conn, thread_name_suffix):153 def serve_conn(self, conn, thread_name_suffix):
154 # For WIN32, where the timeout value from the listening socket154 # For WIN32, where the timeout value from the listening socket