← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/smart/server.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-05-07 10:04:52 UTC
  • mfrom: (3408.4.1 ianc-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20080507100452-ya8ofjjd5f5pb9q7
Nicer error when smart server started on an address already in use
        (Andrea Corbellini)

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)