~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/smart/medium.py

  • Committer: Jelmer Vernooij
  • Date: 2008-09-19 00:57:26 UTC
  • mto: This revision was merged to the branch mainline in revision 3714.
  • Revision ID: jelmer@samba.org-20080919005726-sbvjd808xkjbbroe
Avoid using AI_ADDRCONFIG since it's not portable.

Show diffs side-by-side

added added

removed removed

Lines of Context:
740
740
            port = BZR_DEFAULT_PORT
741
741
        else:
742
742
            port = int(self._port)
743
 
        sockaddrs = socket.getaddrinfo(self._host, port, socket.AF_UNSPEC, 
744
 
            socket.SOCK_STREAM, 0, socket.AI_ADDRCONFIG)
 
743
        try:
 
744
            sockaddrs = socket.getaddrinfo(self._host, port, socket.AF_UNSPEC, 
 
745
                socket.SOCK_STREAM, 0, 0)
 
746
        except socket.gaierror, (err_num, err_msg):
 
747
            raise errors.ConnectionError("failed to lookup %s:%d: %s" %
 
748
                    (self._host, port, err_msg))
745
749
        err = socket.error("no address found for %s" % self._host)
746
750
        for (family, socktype, proto, canonname, sockaddr) in sockaddrs:
747
751
            try: