Rev 4487: (jam) When getting a ConnectionError during 'bzr pull/merge' don't in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 4487 [merge]
revision-id: pqm at pqm.ubuntu.com-20090626180331-304i6c0fz5nc54fs
parent: pqm at pqm.ubuntu.com-20090626155213-fr2l56hp7m5rzllt
parent: john at arbash-meinel.com-20090619144528-bwuwb2phua2pafb4
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2009-06-26 19:03:31 +0100
message:
  (jam) When getting a ConnectionError during 'bzr pull/merge' don't
  	try to connect a second time.
modified:
  bzrlib/bundle/__init__.py      changeset.py-20050513021216-b02ab57fb9738913
=== modified file 'bzrlib/bundle/__init__.py'
--- a/bzrlib/bundle/__init__.py	2009-03-23 14:59:43 +0000
+++ b/bzrlib/bundle/__init__.py	2009-06-19 14:45:28 +0000
@@ -45,10 +45,6 @@
         possible_transports=possible_transports)
     transport = child_transport.clone('..')
     filename = transport.relpath(child_transport.base)
-    if filename.endswith('/'):
-        # A path to a directory was passed in
-        # definitely not a bundle
-        raise errors.NotABundle('A directory cannot be a bundle')
     mergeable, transport = read_mergeable_from_transport(transport, filename,
                                                          _do_directive)
     return mergeable
@@ -82,7 +78,7 @@
             return directive, transport
         else:
             return _serializer.read_bundle(f), transport
-    except errors.ConnectionReset:
+    except (errors.ConnectionReset, errors.ConnectionError), e:
         raise
     except (errors.TransportError, errors.PathError), e:
         raise errors.NotABundle(str(e))