#
#
# patch "www/viewmtn/.htaccess"
# from [696ab9f90e6cae432c3f8628a91c765433f00756]
# to [6f486de4818ebae3ec18230ff7d700d65814e14e]
#
# patch "www/viewmtn/branch.psp"
# from [08a0e167ebb6416ca636a59ae0bb4ac020b148af]
# to [079ea18ca3381711337ded97d52099621e08e923]
#
# patch "www/viewmtn/html.py"
# from [8344c7b901ccd05b338a1322b0c0b57998985fcc]
# to [2fcf572f2cd0f490e360872b35d663f057ec0e89]
#
# patch "www/viewmtn/wrapper.py"
# from [dbbc871353ddfec1b56bf57b743a6b5cd70688c2]
# to [74ed9539b82abb9d1a6952aafe0b03b63c44abcf]
#
============================================================
--- www/viewmtn/.htaccess 696ab9f90e6cae432c3f8628a91c765433f00756
+++ www/viewmtn/.htaccess 6f486de4818ebae3ec18230ff7d700d65814e14e
@@ -1,7 +1,7 @@
AddHandler mod_python .psp
Options FollowSymLinks
PythonHandler wrapper
-PythonInterpreter viewmtn
+PythonInterpPerDirectory on
AddHandler mod_python .py
DirectoryIndex index.psp
PythonAutoReload On
============================================================
--- www/viewmtn/branch.psp 08a0e167ebb6416ca636a59ae0bb4ac020b148af
+++ www/viewmtn/branch.psp 079ea18ca3381711337ded97d52099621e08e923
@@ -53,7 +53,7 @@
%s
%s
- %s''' % (page_title, config.base_url, page_title))
+ %s''' % (page_title, config.base_url(req.uri), page_title))
heads = mt.heads(branch)
@@ -91,7 +91,7 @@
if output == 'rss':
req.write('- \n')
- req.write('%s\n' % (urllib.basejoin(config.base_url, 'revision.psp?id=%s' % (urllib.quote(id)))))
+ req.write('%s\n' % (urllib.basejoin(config.base_url(req.uri), 'revision.psp?id=%s' % (urllib.quote(id)))))
certdate, quicklog, certinfo = None, "", ""
for cert in certs:
============================================================
--- www/viewmtn/html.py 8344c7b901ccd05b338a1322b0c0b57998985fcc
+++ www/viewmtn/html.py 2fcf572f2cd0f490e360872b35d663f057ec0e89
@@ -71,7 +71,7 @@
ViewMTN: %(short_title)s
-
+
%(extra_header)s
@@ -79,6 +79,7 @@
============================================================
--- www/viewmtn/wrapper.py dbbc871353ddfec1b56bf57b743a6b5cd70688c2
+++ www/viewmtn/wrapper.py 74ed9539b82abb9d1a6952aafe0b03b63c44abcf
@@ -174,7 +174,7 @@
# common variables which all handlers (PSP or not)
# should have access to; ensure that these variables
# are cleaned up
- mt = Monotone(config.monotone, config.dbfile)
+ mt = Monotone(config.monotone, config.dbfile(req.uri))
def our_link (link_type, link_to, description=None, no_quote=False):
return common.link(mt, link_type, link_to, description, no_quote)
vars = {