changeset 1028:0a17e082460b

merged changes from Thomas
author Fabio Montefuscolo <fabio.montefuscolo@gmail.com>
date Sun, 30 Oct 2011 02:42:32 -0200
parents 1f3d66455a88 (current diff) f9f1170c273e (diff)
children fd6324f25f87
files
diffstat 1 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/storage/middleware/routing.py	Sun Oct 30 02:40:48 2011 -0200
+++ b/MoinMoin/storage/middleware/routing.py	Sun Oct 30 02:42:32 2011 -0200
@@ -79,7 +79,11 @@
         backend, _, mountpoint = self._get_backend(name)
         meta, data = backend.retrieve(revid)
         if mountpoint:
-            meta[NAME] = u'{0}/{1}'.format(mountpoint, meta[NAME])
+            name = meta[NAME]
+            if name:
+                meta[NAME] = u'{0}/{1}'.format(mountpoint, meta[NAME])
+            else:
+                meta[NAME] = mountpoint # no trailing slash!
         return meta, data
 
     # writing part