changeset 4587:ad5851792007

make 'make underlay' work
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Sun, 15 Feb 2009 22:39:29 +0100
parents 5e9cc0c88ef6
children 633a4ce5ac4a
files Makefile MoinMoin/web/contexts.py
diffstat 2 files changed, 3 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Sun Feb 15 22:16:17 2009 +0100
+++ b/Makefile	Sun Feb 15 22:39:29 2009 +0100
@@ -47,8 +47,8 @@
 # Should be used only on TW machine
 underlay:
 	rm -rf $(share)/underlay
-	MoinMoin/script/moin.py --config-dir=/srv/moin/cfg/1.9 --wiki-url=master19.moinmo.in/ maint globaledit
-	MoinMoin/script/moin.py --config-dir=/srv/moin/cfg/1.9 --wiki-url=master19.moinmo.in/ maint reducewiki --target-dir=$(share)/underlay
+	MoinMoin/script/moin.py --config-dir=/srv/moin/cfg/1.9 --wiki-url=http://master19.moinmo.in/ maint globaledit
+	MoinMoin/script/moin.py --config-dir=/srv/moin/cfg/1.9 --wiki-url=http://master19.moinmo.in/ maint reducewiki --target-dir=$(share)/underlay
 	rm -rf $(share)/underlay/pages/InterWikiMap
 	rm -rf $(share)/underlay/pages/MoinPagesEditorGroup
 	cd $(share); rm -f underlay.tar; tar cf underlay.tar underlay
--- a/MoinMoin/web/contexts.py	Sun Feb 15 22:16:17 2009 +0100
+++ b/MoinMoin/web/contexts.py	Sun Feb 15 22:39:29 2009 +0100
@@ -410,14 +410,13 @@
     to sys.stdout though.
     """
     def __init__(self, url='CLI', pagename=''):
-        environ = create_environ()
+        environ = create_environ(base_url=url) # XXX not sure about base_url, but makes "make underlay" work
         environ['HTTP_USER_AGENT'] = 'CLI/Script'
         environ['wsgi.input'] = sys.stdin
         request = Request(environ)
         super(ScriptContext, self).__init__(request)
         from MoinMoin import wsgiapp
         wsgiapp.init(self)
-        request.url = url
 
     def write(self, *data):
         for d in data: