4 commits - pykolab/imap pykolab/logger.py pykolab/setup

[Jeroen van Meeuwen]

 pykolab/imap/__init__.py        |    2 ++
 pykolab/logger.py               |   34 ++++++++++++++++++----------------
 pykolab/setup/setup_freebusy.py |    4 ++--
 pykolab/setup/setup_mta.py      |    2 +-
 4 files changed, 23 insertions(+), 19 deletions(-)

New commits:
commit 27f4d069f721b254c5db7249bd792d0fec52fc40
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Tue Aug 19 13:18:45 2014 +0200

    Fix #3350, _acl referenced before assignment

diff --git a/pykolab/imap/__init__.py b/pykolab/imap/__init__.py
index b3af455..7ee19a6 100644
--- a/pykolab/imap/__init__.py
+++ b/pykolab/imap/__init__.py
@@ -319,6 +319,8 @@ class IMAP(object):
         """
             Set an ACL entry on a folder.
         """
+        _acl = []
+
         short_rights = {
                 'all': 'lrsedntxakcpiw',
                 'append': 'wip',


commit a46c3d3a34c2cf9264566c29a429bd8a1d3aec6c
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Tue Aug 19 13:16:26 2014 +0200

    Fix #3349 by testing if a log file already exists

diff --git a/pykolab/logger.py b/pykolab/logger.py
index 8e92259..cce43f5 100644
--- a/pykolab/logger.py
+++ b/pykolab/logger.py
@@ -162,24 +162,26 @@ class Logger(logging.Logger):
 
                         sys.exit(1)
 
-                try:
-                    os.chown(
-                            self.logfile,
-                            user_uid,
-                            group_gid
-                        )
-                    os.chmod(self.logfile, 0660)
-                except Exception, errmsg:
-                    self.error(_("Could not change permissions on %s: %r") % (self.logfile, errmsg))
-                    if self.debuglevel > 8:
-                        import traceback
-                        traceback.print_exc()
+                if os.path.isfile(self.logfile):
+                    try:
+                        os.chown(
+                                self.logfile,
+                                user_uid,
+                                group_gid
+                            )
+                        os.chmod(self.logfile, 0660)
+                    except Exception, errmsg:
+                        self.error(_("Could not change permissions on %s: %r") % (self.logfile, errmsg))
+                        if self.debuglevel > 8:
+                            import traceback
+                            traceback.print_exc()
 
         except Exception, errmsg:
-            self.error(_("Could not change permissions on %s: %r") % (self.logfile, errmsg))
-            if self.debuglevel > 8:
-                import traceback
-                traceback.print_exc()
+            if os.path.isfile(self.logfile):
+                self.error(_("Could not change permissions on %s: %r") % (self.logfile, errmsg))
+                if self.debuglevel > 8:
+                    import traceback
+                    traceback.print_exc()
 
         # Make sure the log file exists
         try:


commit af9c30d69a2e0f6e428d239359c4bb4be7ab8595
Author: Daniel Hoffend <dh at dotlan.net>
Date:   Tue Aug 19 13:12:50 2014 +0200

    virtualaliasmaps only for sharedfolders of kolabFolderType=mail (#3311)

diff --git a/pykolab/setup/setup_mta.py b/pykolab/setup/setup_mta.py
index 166b402..c3ab0e3 100644
--- a/pykolab/setup/setup_mta.py
+++ b/pykolab/setup/setup_mta.py
@@ -224,7 +224,7 @@ domain = ldap:/etc/postfix/ldap/mydestination.cf
 bind_dn = %(service_bind_dn)s
 bind_pw = %(service_bind_pw)s
 
-query_filter = (&(|(mail=%%s)(alias=%%s))(objectclass=kolabsharedfolder))
+query_filter = (&(|(mail=%%s)(alias=%%s))(objectclass=kolabsharedfolder)(kolabFolderType=mail))
 result_attribute = kolabtargetfolder
 result_format = shared+%%s
 """ % {


commit f179b42eb66d1f436f63c118f46d26eed33dc9ca
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Tue Aug 19 13:06:53 2014 +0200

    %mail -> %s

diff --git a/pykolab/setup/setup_freebusy.py b/pykolab/setup/setup_freebusy.py
index dfabab5..b255bc3 100644
--- a/pykolab/setup/setup_freebusy.py
+++ b/pykolab/setup/setup_freebusy.py
@@ -101,7 +101,7 @@ def execute(*args, **kw):
                     'attributes': 'mail',
                     'lc_attributes': 'mail',
                     'fbsource': users_imap_uri,
-                    'cacheto': '/var/cache/kolab-freebusy/%mail.ifb',
+                    'cacheto': '/var/cache/kolab-freebusy/%s.ifb',
                     'expires': '15m',
                     'loglevel': 300,
                 },
@@ -114,7 +114,7 @@ def execute(*args, **kw):
                     'attributes': 'mail, kolabtargetfolder',
                     'filter': '(&(objectClass=kolabsharedfolder)(kolabfoldertype=event)(mail=%s))',
                     'fbsource': resources_imap_uri,
-                    'cacheto': '/var/cache/kolab-freebusy/%mail.ifb',
+                    'cacheto': '/var/cache/kolab-freebusy/%s.ifb',
                     'expires': '15m',
                     'loglevel': 300,
                 },