Important bug preventing the use of rules.

* 'return conf' was missing from readConfiguration !
* Path to Cyrus deliver binary changed to reflect
  the location on this command on Gentoo system with
  Cyrus 2.2.
git-archimport-id: frederic@jolliton.com--2004-private/mail-filter--main--0.1--patch-8

diff --git a/README b/README
index 11603d5..ab7c900 100644 (file)
--- a/README
+++ b/README
@@ -63,3 +63,4 @@ Todo
     external script (or even "just" python module.)
 [ ] For mail rejected by Cyrus because of invalid header, encapsulate the
     mail into a new one, and feed this one to Cyrus (and tagged as broken.)
+[ ] Allow mail.filter to re-file mails already present in a Cyrus folder.

diff --git a/confparser.py b/confparser.py
index f669fdb..3c6b872 100644 (file)
--- a/confparser.py
+++ b/confparser.py
@@ -247,6 +247,7 @@ def readConfiguration( filename ) :
                writeCachedConfiguration( filename , conf , isValid )
        except Exception , e :
                raise Exception( 'While reading file %s:\n%s' % ( filename , str( e ) ) )
+       return conf
 
 #--[ Dump configuration tree ]------------------------------------------------
 

diff --git a/mail.filter b/mail.filter
index 4389f44..4a863cd 100755 (executable)
--- a/mail.filter
+++ b/mail.filter
@@ -141,7 +141,7 @@ g_directoryRules   = '/var/mail.filter/rules/'
 #
 # Path to Cyrus's deliver binary.
 #
-g_pathCyrusDeliver = '/usr/cyrus/bin/deliver'
+g_pathCyrusDeliver = '/usr/lib/cyrus/deliver'
 
 #
 # Path to spamprobe binary.
@@ -830,6 +830,8 @@ def checkConfiguration( filename ) :
                confparser.readConfiguration( filename )
        except Exception , e :
                print e
+       else :
+               print filename , ok
 
 #-----------------------------------------------------------------------------