merge from HEAD

Author: Richard Jones

CHANGES.txt

@@ -21,6 +21,7 @@ Fixed:
   "debug" multiprocess mode (roundup-server) or the DEBUG_TO_CLIENT var
   (roundup.cgi) to have the errors appear in your browser
 - fix setgid typo (sf bug 1171346)
+- fix faulty find_template filename facility (sf bug 1163629)
 
 
 2005-03-03 0.8.2

doc/admin_guide.txt

@@ -2,7 +2,7 @@
 Administration Guide
 ====================
 
-:Version: $Revision: 1.15.2.1 $
+:Version: $Revision: 1.15.2.2 $
 
 .. contents::
 
@@ -220,8 +220,8 @@ Migrating Backends
 2. use the roundup-admin tool "export" command to export the contents of
    your tracker to disk
 3. copy the tracker home to a new directory
-4. change the backend used in the tracker home ``select_db.py`` file
-5. delete the "db" directory from the new directory
+4. delete the "db" directory from the new directory
+5. enter the new backend name in the tracker home ``db/backend_name`` file
 6. use the roundup-admin "import" command to import the previous export with
    the new tracker home
 7. test each of the admin tool, web interface and mail gateway using the new

doc/index.txt

@@ -143,6 +143,7 @@ Nathaniel Smith,
 Maciej Starzyk,
 Mitchell Surface,
 Mike Thompson,
+Michael Twomey,
 Martin Uzak,
 Darryl VanDorp,
 J Vickroy,

doc/upgrading.txt

@@ -97,6 +97,9 @@ The ``dbinit.py`` file has been split into two new files,
   need to be copied. Neither do the last few lines -- those starting
   with ``import detectors``, down to ``return db`` inclusive.
 
+You may remove the ``__init__.py`` module from the "detectors" directory as
+it is no longer used.
+
 There's a new way to write extension code for Roundup - the old
 ``interfaces.py`` file will be ignored. See the `customisation
 documentation`_ for information about how extensions are now written.

roundup/cgi/templating.py

@@ -85,10 +85,10 @@ def find_template(dir, name, view):
 
     # try with a .html or .xml extension (new-style)
     for extension in '.html', '.xml':
-        filename = filename + extension
-        src = os.path.join(dir, filename)
+        f = filename + extension
+        src = os.path.join(dir, f)
         if os.path.exists(src):
-            return (src, filename)
+            return (src, f)
 
     # no view == no generic template is possible
     if not view:

roundup/scripts/roundup_server.py

@@ -17,7 +17,7 @@
 
 """Command-line script that runs a server over roundup.cgi.client.
 
-$Id: roundup_server.py,v 1.74.2.4 2005-04-13 06:11:15 richard Exp $
+$Id: roundup_server.py,v 1.74.2.5 2005-04-13 06:12:02 richard Exp $
 """
 __docformat__ = 'restructuredtext'
 
@@ -263,7 +263,7 @@ def setgid(group):
         return
 
     # if root, setgid to the running user
-    if not os.getuid():
+    if os.getuid():
         print _('WARNING: ignoring "-g" argument, not root')
         return
 

templates/classic/schema.py

@@ -124,7 +124,9 @@ def own_record(db, userid, itemid):
 # Let anonymous users access the email interface (note that this implies
 # that they will be registered automatically, hence they will need the
 # "Create" user Permission below)
-db.security.addPermissionToRole('Anonymous', 'Email Access')
+# This is disabled by default to stop spam from auto-registering users on
+# public trackers.
+#db.security.addPermissionToRole('Anonymous', 'Email Access')
 
 # Assign the appropriate permissions to the anonymous user's Anonymous
 # Role. Choices here are: