/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/smart/server.py

  • Committer: Vincent Ladeuil
  • Date: 2008-05-08 21:22:06 UTC
  • mfrom: (3417 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3418.
  • Revision ID: v.ladeuil+lp@free.fr-20080508212206-kwlteu651izgs5we
merge bzr.dev to fix conflicts in NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/server.py
64
64
        if sys.platform != 'win32':
65
65
            self._server_socket.setsockopt(socket.SOL_SOCKET,
66
66
                socket.SO_REUSEADDR, 1)
67
 
        self._server_socket.bind((host, port))
 
67
        try:
 
68
            self._server_socket.bind((host, port))
 
69
        except self._socket_error, message:
 
70
            raise errors.CannotBindAddress(host, port, message)
68
71
        self._sockname = self._server_socket.getsockname()
69
72
        self.port = self._sockname[1]
70
73
        self._server_socket.listen(1)
238
241
            `bzr://127.0.0.1:nnnn/`.  Default value is `extra`, so that tests
239
242
            by default will fail unless they do the necessary path translation.
240
243
        """
241
 
        assert client_path_extra.startswith('/')
 
244
        if not client_path_extra.startswith('/'):
 
245
            raise ValueError(client_path_extra)
242
246
        from bzrlib.transport.chroot import ChrootServer
243
247
        if backing_transport_server is None:
244
248
            from bzrlib.transport.local import LocalURLServer
257
261
 
258
262
    def get_url(self):
259
263
        url = super(SmartTCPServer_for_testing, self).get_url()
260
 
        assert url.endswith('/')
261
264
        return url[:-1] + self.client_path_extra
262
265
 
263
266
    def get_bogus_url(self):
272
275
        """Get a backing transport from a server we are decorating."""
273
276
        url = 'readonly+' + backing_transport_server.get_url()
274
277
        return transport.get_transport(url)
275