Rev 1343: Fix converting redirect errors. in http://people.samba.org/bzr/jelmer/bzr-svn/0.4

[Jelmer Vernooij]

At http://people.samba.org/bzr/jelmer/bzr-svn/0.4

------------------------------------------------------------
revno: 1343
revision-id: jelmer at samba.org-20080624133625-t2w274ad58cgqncf
parent: jelmer at samba.org-20080624111743-q1lzyb7326gq3iz0
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Tue 2008-06-24 15:36:25 +0200
message:
  Fix converting redirect errors.
modified:
  transport.py                   transport.py-20060406231150-b3472d06b3a0818d
=== modified file 'transport.py'
--- a/transport.py	2008-06-24 01:56:19 +0000
+++ b/transport.py	2008-06-24 13:36:25 +0000
@@ -28,7 +28,7 @@
 from bzrlib.plugins.svn.auth import create_auth_baton
 from bzrlib.plugins.svn.client import get_config
 from bzrlib.plugins.svn.core import SubversionException
-from bzrlib.plugins.svn.errors import convert_svn_error, NoSvnRepositoryPresent, ERR_BAD_URL, ERR_RA_SVN_REPOS_NOT_FOUND, ERR_FS_ALREADY_EXISTS, ERR_FS_NOT_FOUND, ERR_FS_NOT_DIRECTORY, ERR_RA_DAV_RELOCATED
+from bzrlib.plugins.svn.errors import convert_svn_error, NoSvnRepositoryPresent, ERR_BAD_URL, ERR_RA_SVN_REPOS_NOT_FOUND, ERR_FS_ALREADY_EXISTS, ERR_FS_NOT_FOUND, ERR_FS_NOT_DIRECTORY, ERR_RA_DAV_RELOCATED, RedirectRequested
 from bzrlib.plugins.svn.ra import DIRENT_KIND, RemoteAccess
 import urlparse
 import urllib
@@ -51,13 +51,7 @@
     if isinstance(bzr_transport, SvnRaTransport):
         return bzr_transport
 
-    try:
-        return SvnRaTransport(bzr_transport.base)
-    except SubversionException, (msg, num):
-        if num == ERR_RA_DAV_RELOCATED:
-            raise RedirectRequested(url, msg.split("'")[1], is_permanent=True)
-        raise
-
+    return SvnRaTransport(bzr_transport.base)
 
 def _url_unescape_uri(url):
     (scheme, netloc, path, query, fragment) = urlparse.urlsplit(url)
@@ -96,6 +90,8 @@
             raise NoSvnRepositoryPresent(url=url)
         if num == ERR_BAD_URL:
             raise InvalidURL(url)
+        if num == ERR_RA_DAV_RELOCATED:
+            raise RedirectRequested(url, msg.split("'")[1], is_permanent=True)
         raise
 
     from bzrlib.plugins.svn import lazy_check_versions