Merge c126512 from 2.13 branch

b5ebf7e9 · Hanno Schlichting · 30b54fd5 · b5ebf7e9
Commit b5ebf7e9 authored May 28, 2012 by Hanno Schlichting
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

src/App/CacheManager.py src/App/CacheManager.py +4 -4

No files found.
--- a/src/App/CacheManager.py
+++ b/src/App/CacheManager.py
@@ -97,10 +97,10 @@ class CacheManager:
        if REQUEST is not None:
            # format as text
            REQUEST.RESPONSE.setHeader('Content-Type', 'text/plain')
-            return '\n'.join('%6d %s'%(count, name) for count, name in detail)
+            return '\n'.join(
-        else:
+                ['%6d %s' % (count, name) for name, count in detail])
-            # raw
+        # raw
-            return detail
+        return detail
    def cache_extreme_detail(self, REQUEST=None):
        """