summaryrefslogtreecommitdiffstats
path: root/pykolab/conf
diff options
context:
space:
mode:
authorJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2012-04-19 17:00:20 +0100
committerJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2012-04-19 17:00:20 +0100
commit77d3804884bd6fc13182ec26f8d2d447cda3be61 (patch)
treece79d070bf9629d2067d253372342d893c9b7935 /pykolab/conf
parent1a2d4b809307316a59961811d3f252e0b50477fe (diff)
downloadpykolab-77d3804884bd6fc13182ec26f8d2d447cda3be61.tar.gz
Rebase on specification
Diffstat (limited to 'pykolab/conf')
-rw-r--r--pykolab/conf/__init__.py10
-rw-r--r--pykolab/conf/defaults.py4
2 files changed, 12 insertions, 2 deletions
diff --git a/pykolab/conf/__init__.py b/pykolab/conf/__init__.py
index fdf723f..9092689 100644
--- a/pykolab/conf/__init__.py
+++ b/pykolab/conf/__init__.py
@@ -48,6 +48,8 @@ class Conf(object):
self.entitlement = None
+ self.changelog = {}
+
try:
from pykolab.conf.entitlement import Entitlement
entitlements = True
@@ -496,8 +498,14 @@ class Conf(object):
if not self.cfg_parser:
self.read_config()
+ #log.debug(_("Obtaining value for section %r, key %r") % (section, key), level=8)
+
if self.cfg_parser.has_option(section, key):
- return self.cfg_parser.get(section,key)
+ try:
+ return self.cfg_parser.get(section, key)
+ except:
+ self.read_config()
+ return self.cfg_parser.get(section, key)
if hasattr(self, "get_%s_%s" % (section,key)):
try:
diff --git a/pykolab/conf/defaults.py b/pykolab/conf/defaults.py
index 22e8cc4..9fd6e8b 100644
--- a/pykolab/conf/defaults.py
+++ b/pykolab/conf/defaults.py
@@ -29,6 +29,8 @@ class Defaults(object):
# library should try to retrieve annotations
self.cyrus_annotations_retry_interval = 1
- self.address_search_attrs = "mail, alias"
+ self.address_search_attrs = ['mail', 'alias']
+ self.mail_attributes = ['mail', 'alias']
self.kolab_default_locale = 'en_US'
+ self.ldap_unique_attribute = 'nsuniqueid' \ No newline at end of file