changeset 554:e5e529840fcf

fixed Makefile, setup.py, comments imported from: moin--main--1.5--patch-558
author Thomas Waldmann <tw@waldmann-edv.de>
date Wed, 12 Apr 2006 15:08:46 +0000
parents 42c37dcdc314
children ca312363c3c3
files ChangeLog Makefile MoinMoin/wikiaction.py setup.py
diffstat 4 files changed, 19 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Apr 11 14:50:04 2006 +0000
+++ b/ChangeLog	Wed Apr 12 15:08:46 2006 +0000
@@ -2,6 +2,20 @@
 # arch-tag: automatic-ChangeLog--arch@arch.thinkmo.de--2003-archives/moin--main--1.5
 #
 
+2006-04-12 16:08:46 GMT	Thomas Waldmann <tw@waldmann-edv.de>	patch-558
+
+    Summary:
+      fixed Makefile, setup.py, comments
+    Revision:
+      moin--main--1.5--patch-558
+
+    fixed Makefile, setup.py, comments
+    
+
+    modified files:
+     ChangeLog Makefile MoinMoin/wikiaction.py setup.py
+
+
 2006-04-11 15:50:04 GMT	Thomas Waldmann <tw@waldmann-edv.de>	patch-557
 
     Summary:
--- a/Makefile	Tue Apr 11 14:50:04 2006 +0000
+++ b/Makefile	Wed Apr 12 15:08:46 2006 +0000
@@ -76,7 +76,7 @@
 # Merge from main branch
 # Ignore error in the merge and update underlay
 merge:
-	tla star-merge arch@arch.thinkmo.de--2003-archives/moin--main--1.3
+	tla star-merge arch@arch.thinkmo.de--2003-archives/moin--main--1.5
 
 test: 
 	@python tests/maketestwiki.py
--- a/MoinMoin/wikiaction.py	Tue Apr 11 14:50:04 2006 +0000
+++ b/MoinMoin/wikiaction.py	Wed Apr 12 15:08:46 2006 +0000
@@ -575,7 +575,7 @@
     from MoinMoin.converter.text_html_text_x_moin import convert, ConvertError
     try:
         if lasteditor == 'gui':
-            savetext = convert(request, pagename, savetext) # XXX error handling
+            savetext = convert(request, pagename, savetext)
                 
         # IMPORTANT: normalize text from the form. This should be done in
         # one place before we manipulate the text.
--- a/setup.py	Tue Apr 11 14:50:04 2006 +0000
+++ b/setup.py	Wed Apr 12 15:08:46 2006 +0000
@@ -208,9 +208,11 @@
         'MoinMoin.script',
         'MoinMoin.script.account',
         'MoinMoin.script.cli',
+        'MoinMoin.script.export',
+        'MoinMoin.script.import',
         'MoinMoin.script.maint',
         'MoinMoin.script.migration',
-        'MoinMoin.script.import',
+        'MoinMoin.script.lupy',
         'MoinMoin.script.old',
         'MoinMoin.script.old.migration',
         'MoinMoin.script.old.xmlrpc-tools',