changeset 4576:95dc19f1ea75

merged moin/1.8
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Sat, 14 Feb 2009 22:35:43 +0100
parents 30cc750e28b4 (current diff) bc0ad5554ab0 (diff)
children bbdcf159f469
files MoinMoin/config/multiconfig.py MoinMoin/script/migration/_conv160a.py
diffstat 3 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/config/multiconfig.py	Thu Feb 12 22:21:58 2009 +0100
+++ b/MoinMoin/config/multiconfig.py	Sat Feb 14 22:35:43 2009 +0100
@@ -1213,7 +1213,7 @@
       ('compression', 'gz', 'What compression to use for the backup ("gz" or "bz2").'),
       ('users', [], 'List of trusted user names who are allowed to get a backup.'),
       ('include', [], 'List of pathes to backup.'),
-      ('exclude', lambda filename: False, 'Function f(filename) that tells whether a file should be excluded from backup. By default, nothing is excluded.'),
+      ('exclude', lambda self, filename: False, 'Function f(self, filename) that tells whether a file should be excluded from backup. By default, nothing is excluded.'),
     )),
 }
 
--- a/MoinMoin/events/xapian_index.py	Thu Feb 12 22:21:58 2009 +0100
+++ b/MoinMoin/events/xapian_index.py	Sat Feb 14 22:35:43 2009 +0100
@@ -61,7 +61,7 @@
         from MoinMoin.search.Xapian import Index
         index = Index(request)
         if index.exists():
-            index.update_page(request.page.page_name)
+            index.update_page(event.pagename)
 
 
 def handle(event):
--- a/MoinMoin/script/migration/_conv160a.py	Thu Feb 12 22:21:58 2009 +0100
+++ b/MoinMoin/script/migration/_conv160a.py	Sat Feb 14 22:35:43 2009 +0100
@@ -45,7 +45,7 @@
 
 import mimetypes # this MUST be after wikiutil import!
 
-from _conv160b_wiki import convert_wiki
+from _conv160a_wiki import convert_wiki
 
 create_rev = True # create a <new> rev with the converted content of <new-1> rev?