changeset 3692:02a602f955f6

merged main
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Sun, 08 Jun 2008 23:30:50 +0200
parents a5e33ae8f469 (current diff) a1a9ac307c0e (diff)
children f976d490b9df
files
diffstat 3 files changed, 13 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Sun Jun 08 23:30:10 2008 +0200
+++ b/Makefile	Sun Jun 08 23:30:50 2008 +0200
@@ -25,6 +25,17 @@
         build/INSTALL.html >docs/INSTALL.html
 	-rm build/INSTALL.html
 
+	wget -U MoinMoin/Makefile -O build/UPDATE.html "http://master17.moinmo.in/HelpOnUpdating?action=print"
+	sed \
+		-e 's#href="/#href="http://master17.moinmo.in/#g' \
+		-e 's#http://[a-z\.]*/wiki/classic/#/wiki/classic/#g' \
+		-e 's#http://[a-z\.]*/wiki/modern/#/wiki/modern/#g' \
+		-e 's#http://[a-z\.]*/wiki/rightsidebar/#/wiki/rightsidebar/#g' \
+		-e 's#/wiki/classic/#wiki/htdocs/classic/#g' \
+		-e 's#/wiki/modern/#wiki/htdocs/modern/#g' \
+		-e 's#/wiki/rightsidebar/#wiki/htdocs/rightsidebar/#g' \
+        build/UPDATE.html >docs/UPDATE.html
+	-rm build/UPDATE.html
 	-rmdir build
 
 interwiki:
--- a/MoinMoin/action/SyncPages.py	Sun Jun 08 23:30:10 2008 +0200
+++ b/MoinMoin/action/SyncPages.py	Sun Jun 08 23:30:50 2008 +0200
@@ -255,7 +255,7 @@
             match_direction = None
 
         local_full_iwid = packLine([local.get_iwid(), local.get_interwiki_name()])
-        remote_full_iwid = packLine([remote.get_iwid(), remote.get_interwiki_name()])
+        remote_full_iwid = remote.iwid_full
 
         self.log_status(self.INFO, _("Synchronisation started -"), raw_suffix=" <<DateTime(%s)>>" % self.page._get_local_timestamp())
 
--- a/MoinMoin/xmlrpc/__init__.py	Sun Jun 08 23:30:10 2008 +0200
+++ b/MoinMoin/xmlrpc/__init__.py	Sun Jun 08 23:30:50 2008 +0200
@@ -164,7 +164,7 @@
                 # wrap response in a singleton tuple
                 response = (response, )
                 # serialize it
-                response = xmlrpclib.dumps(response, methodresponse=1)
+                response = xmlrpclib.dumps(response, methodresponse=1, allow_none=True)
 
         self.request.emit_http_headers([
             "Content-Type: text/xml; charset=utf-8",