[Pkg-bazaar-commits] r274 ./bzr-svn/unstable: Merge last-minute fix that went into 0.4.2.

[Jelmer Vernooij]

------------------------------------------------------------
revno: 274
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: debian
timestamp: Sun 2007-09-09 03:15:04 +0200
message:
  Merge last-minute fix that went into 0.4.2.
modified:
  transport.py
    ------------------------------------------------------------
    revno: 220.1.182.1.258.1.23
    merged: jelmer at samba.org-20070909011307-a3opiz4wyikoo94c
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Sun 2007-09-09 03:13:07 +0200
    message:
      work around another assert in the subversion bindings.
-------------- next part --------------
=== modified file 'transport.py'
--- a/transport.py	2007-09-09 00:43:15 +0000
+++ b/transport.py	2007-09-09 01:15:04 +0000
@@ -354,11 +354,13 @@
             return svn.ra.get_dir(self._ra, path, revnum)
 
     def _request_path(self, relpath):
-        if self._backing_url != self.svn_url:
-            relpath = urlutils.join(
-                    urlutils.relative_url(self._backing_url, self.svn_url),
-                    relpath)
-        return relpath
+        if self._backing_url == self.svn_url:
+            return relpath
+        newrelpath = urlutils.join(
+                urlutils.relative_url(self._backing_url, self.svn_url),
+                relpath).rstrip("/")
+        self.mutter('request path %r -> %r' % (relpath, newrelpath))
+        return newrelpath
 
     @convert_svn_error
     def list_dir(self, relpath):