← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/sftp.py

  • Committer: Martin Pool
  • Date: 2009-12-09 05:47:32 UTC
  • mfrom: (4879 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4880.
  • Revision ID: mbp@sourcefrog.net-20091209054732-7414e9uma23mfv6x
trivial merge of trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/sftp.py
917
917
        self._socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
918
918
        self._socket.bind(('localhost', 0))
919
919
        self._socket.listen(1)
920
 
        self.port = self._socket.getsockname()[1]
 
920
        self.host, self.port = self._socket.getsockname()[:2]
921
921
        self._stop_event = threading.Event()
922
922
 
923
923
    def stop(self):
1045
1045
 
1046
1046
    def _get_sftp_url(self, path):
1047
1047
        """Calculate an sftp url to this server for path."""
1048
 
        return 'sftp://foo:bar@localhost:%d/%s' % (self._listener.port, path)
 
1048
        return 'sftp://foo:bar@%s:%d/%s' % (self._listener.host,
 
1049
                                            self._listener.port, path)
1049
1050
 
1050
1051
    def log(self, message):
1051
1052
        """StubServer uses this to log when a new server is created."""