diff options
| author | Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> | 2012-01-04 12:29:49 +0100 |
|---|---|---|
| committer | Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> | 2012-01-04 12:29:49 +0100 |
| commit | 6570fb06a787f3b3bf59d40e412105c0a9f4eedc (patch) | |
| tree | 12498a99bdd6c033f8ea05850d6a8d7402b1ed26 /pykolab/conf | |
| parent | 84b58bf324226ac321cee8726bb46d864318cb9e (diff) | |
| download | pykolab-6570fb06a787f3b3bf59d40e412105c0a9f4eedc.tar.gz | |
Don't forget to try/except importing the Entitlements class, and then only fail afterwards
Diffstat (limited to 'pykolab/conf')
| -rw-r--r-- | pykolab/conf/__init__.py | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/pykolab/conf/__init__.py b/pykolab/conf/__init__.py index b078162..69d592e 100644 --- a/pykolab/conf/__init__.py +++ b/pykolab/conf/__init__.py @@ -48,14 +48,15 @@ class Conf(object): self.entitlement = None - from pykolab.conf.entitlement import Entitlement - self.entitlement = Entitlement().get() - - #try: - #from pykolab.conf.entitlement import Entitlement - #self.entitlement = Entitlement().get() - #except: - #pass + try: + from pykolab.conf.entitlement import Entitlement + entitlements = True + except: + entitlements = False + pass + + if entitlements: + self.entitlement = Entitlement().get() self.plugins = None |