4 commits - share/templates ucs/listener.py

Jeroen van Meeuwen vanmeeuwen at kolabsys.com
Fri Oct 4 14:58:29 CEST 2013


 share/templates/header_checks.submission |    1 -
 ucs/listener.py                          |   20 ++++++++++++--------
 2 files changed, 12 insertions(+), 9 deletions(-)

New commits:
commit e4dd9536cb391c04698184e196700133f5b98d3a
Merge: cd2b45b b5d02f2
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Fri Oct 4 14:58:26 2013 +0200

    Merge branch 'master' of ssh://git.kolabsys.com/git/pykolab
    
    Conflicts:
    	configure.ac



commit cd2b45bf4ef9a7b08fc48b2bd82fac0bc7907836
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Fri Oct 4 14:43:24 2013 +0200

    Allow Univention Configuration Registry to influence whether or we delete any mailboxes (#1003420)

diff --git a/ucs/listener.py b/ucs/listener.py
index 232675e..0849640 100755
--- a/ucs/listener.py
+++ b/ucs/listener.py
@@ -25,7 +25,7 @@ import listener
 import logging
 import os
 import sys
-import univention_baseconfig
+from univention.config_registry import ConfigRegistry
 import univention.debug as ulog
 
 sys.path = [
@@ -147,13 +147,17 @@ def handler(*args, **kw):
                 else:
                     log.info("Entry deletion notification for %r does not have a mail server attribute specified." % (dn))
 
-                auth._auth._synchronize_callback(
-                        change_type = 'delete',
-                        previous_dn = None,
-                        change_number = None,
-                        dn = dn,
-                        entry = old
-                    )
+                cfg = ConfigRegistry()
+                cfg.load()
+
+                if cfg.is_true('mail/cyrus/mailbox/delete', True):
+                    auth._auth._synchronize_callback(
+                            change_type = 'delete',
+                            previous_dn = None,
+                            change_number = None,
+                            dn = dn,
+                            entry = old
+                        )
 
         elif isinstance(new, dict) and len(new.keys()) > 0:
             # Old is not a dict (or empty), so the entry is just created


commit 490c75fe2c977a5f04461e530cb5c2dc5af890c6
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Sun Aug 25 16:27:33 2013 +0200

    Remove the removal of the MIME version header field

diff --git a/share/templates/header_checks.submission b/share/templates/header_checks.submission
index 4866ef8..f8691ce 100644
--- a/share/templates/header_checks.submission
+++ b/share/templates/header_checks.submission
@@ -2,4 +2,3 @@
 /^Received:.*127\.0\.0\.1/  IGNORE
 /^User-Agent:/              IGNORE
 /^X-Mailer:/                IGNORE
-/^Mime-Version:/            IGNORE


commit ec5ce126f42b2f06344862bacc1e78281c114ce1
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Sat Aug 24 18:45:54 2013 +0200

    Release 2

diff --git a/configure.ac b/configure.ac
index 79800f8..84d7820 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_INIT([pykolab], 0.6.5)
-AC_SUBST([RELEASE], 1)
+AC_SUBST([RELEASE], 2)
 
 AC_CONFIG_SRCDIR(pykolab/constants.py.in)
 




More information about the commits mailing list