From f74c32a4a8e9eae9c8055c25d3848ff7d836e308 Mon Sep 17 00:00:00 2001
From: Kali Kaneko <kali@leap.se>
Date: Wed, 1 May 2013 04:05:03 +0900
Subject: return None if no key found, avoid KeyError

---
 setup.py                             | 2 +-
 src/leap/common/__init__.py          | 2 +-
 src/leap/common/config/baseconfig.py | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/setup.py b/setup.py
index 3c0f9de..d5323bc 100644
--- a/setup.py
+++ b/setup.py
@@ -41,7 +41,7 @@ setup(
     name='leap.common',
     # If you change version, do it also in
     # src/leap/common/__init__.py
-    version='0.2.1-dev',
+    version='0.2.1-dev2',
     url='https://leap.se/',
     license='GPLv3+',
     author='The LEAP Encryption Access Project',
diff --git a/src/leap/common/__init__.py b/src/leap/common/__init__.py
index 19c43c9..a5ea197 100644
--- a/src/leap/common/__init__.py
+++ b/src/leap/common/__init__.py
@@ -16,4 +16,4 @@ except ImportError:
 
 __all__ = ["certs", "check", "files", "events"]
 
-__version__ = "0.2.1-dev"
+__version__ = "0.2.1-dev2"
diff --git a/src/leap/common/config/baseconfig.py b/src/leap/common/config/baseconfig.py
index edb9b24..146f1e4 100644
--- a/src/leap/common/config/baseconfig.py
+++ b/src/leap/common/config/baseconfig.py
@@ -70,12 +70,11 @@ class BaseConfig:
         @return: returns the value for the specified key in the config
         """
         leap_assert(self._config_checker, "Load the config first")
-        return self._config_checker.config[key]
+        return self._config_checker.config.get(key, None)
 
     def get_path_prefix(self):
         """
         Returns the platform dependant path prefixer
-
         """
         return get_platform_prefixer().get_path_prefix(
             standalone=self.standalone)
-- 
cgit v1.2.3