fixed generic template discovery

git-svn-id: http://svn.roundup-tracker.org/svnroot/roundup/trunk@1795 57a73879-2fb5-44c3-a270-3262357dd7e2

diff --git a/roundup/cgi/templating.py b/roundup/cgi/templating.py
index 86d29edc3d5e6f09ad7da8102c1e42c2d8a881a4..832ac68400715b6dd292595f0cc51a158136215e 100644 (file)
--- a/roundup/cgi/templating.py
+++ b/roundup/cgi/templating.py
@@ -56,7 +56,7 @@ def find_template(dir, name, extension):
         return (src, generic)
 
     # finally, try _generic.html
-    generic = filename + '.html'
+    generic = generic + '.html'
     src = os.path.join(dir, generic)
     if os.path.exists(src):
         return (src, generic)

diff --git a/roundup/init.py b/roundup/init.py
index fd7124c79460d28de6509dd723440826a4b8a684..804ed3184757493925107a6db4a80ff211129934 100644 (file)
--- a/roundup/init.py
+++ b/roundup/init.py
@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: init.py,v 1.26 2003-04-17 03:37:58 richard Exp $
+# $Id: init.py,v 1.27 2003-07-28 23:19:21 richard Exp $
 
 __doc__ = """
 Init (create) a roundup instance.
@@ -86,7 +86,6 @@ def install(instance_home, template):
     # At the moment, it's just a copy
     copytree(template, instance_home)
 
-
 def write_select_db(instance_home, backend):
     ''' Write the file that selects the backend for the tracker
     '''