/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/transport/http/__init__.py

  • Committer: Martin
  • Date: 2009-11-07 08:02:13 UTC
  • mfrom: (4789 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4809.
  • Revision ID: gzlist@googlemail.com-20091107080213-jad185091b3l69ih
Merge bzr.dev 4789 to resolve conflict from the disabling of plink auto-detection, and relocate NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/http/__init__.py
617
617
                raise InvalidHttpResponse(
618
618
                    t._remote_path('.bzr/smart'),
619
619
                    'Expected 200 response code, got %r' % (code,))
620
 
        except errors.InvalidHttpResponse, e:
 
620
        except (errors.InvalidHttpResponse, errors.ConnectionReset), e:
621
621
            raise errors.SmartProtocolError(str(e))
622
622
        return body_filelike
623
623