merge from maint branch

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

diff --git a/CHANGES.txt b/CHANGES.txt
index 82786ec4f15623919997f358c32969a19200d5d8..007759f00310c680ea0f8e44e2dfcdf53f5f0e3e 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,12 @@ Feature:
 - support confirming registration by replying to the email (sf bug 763668)
 
 
+2003-10-?? 0.6.3
+Fixed:
+- Fixed detectors fix incorrectly fixed in bugfix release 0.6.2
+- Added note to upgrading doc for detectors fix in 0.6.2
+
+
 2003-09-29 0.6.2
 Fixed:
 - cleaned up, clarified internal caching API in *dbm backends

diff --git a/doc/upgrading.txt b/doc/upgrading.txt
index cf69f1b118f64980874fe039325ebc24b003f5a3..714995b35106da1454feb721553c69908b089a55 100644 (file)
--- a/doc/upgrading.txt
+++ b/doc/upgrading.txt
@@ -18,6 +18,21 @@ be replaced with a call to Database.getuid().
 
 
 
+Migrating from 0.6.x to 0.6.3
+=============================
+
+0.6.3 Configuration
+-------------------
+
+You will need to copy the file::
+
+  templates/classic/detectors/__init__.py
+
+to your tracker's ``detectors`` directory, replacing the one already there.
+This fixes a couple of bugs in that file.
+
+
+
 Migrating from 0.5 to 0.6
 =========================
 

diff --git a/templates/classic/detectors/__init__.py b/templates/classic/detectors/__init__.py
index 518d3437e6fac313b734ca2baef7c36c72c08d56..7f3ec6d359921bec39604ccaf429002cdb1c65ee 100644 (file)
--- a/templates/classic/detectors/__init__.py
+++ b/templates/classic/detectors/__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.3 2003-09-04 23:44:56 richard Exp $
+#$Id: __init__.py,v 1.4 2003-10-07 06:18:45 richard Exp $
 
 import sys, os, imp
 
@@ -31,7 +31,7 @@ def init(db):
             path = os.path.abspath(os.path.join(this_dir, filename))
             fp = open(path)
             try:
-                module = imp.load_module(name, open(path), path,
+                module = imp.load_module(name, fp, path,
                     ('.py', 'r', imp.PY_SOURCE))
             finally:
                 fp.close()

diff --git a/templates/minimal/detectors/__init__.py b/templates/minimal/detectors/__init__.py
index 518d3437e6fac313b734ca2baef7c36c72c08d56..7f3ec6d359921bec39604ccaf429002cdb1c65ee 100644 (file)
--- a/templates/minimal/detectors/__init__.py
+++ b/templates/minimal/detectors/__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.3 2003-09-04 23:44:56 richard Exp $
+#$Id: __init__.py,v 1.4 2003-10-07 06:18:45 richard Exp $
 
 import sys, os, imp
 
@@ -31,7 +31,7 @@ def init(db):
             path = os.path.abspath(os.path.join(this_dir, filename))
             fp = open(path)
             try:
-                module = imp.load_module(name, open(path), path,
+                module = imp.load_module(name, fp, path,
                     ('.py', 'r', imp.PY_SOURCE))
             finally:
                 fp.close()