Merge "conf.py: deal siteconf when set in init"

[platform/upstream/mic.git] / mic / conf.py

diff --git a/mic/conf.py b/mic/conf.py
index 1af3320..24024df 100644 (file)
--- a/mic/conf.py
+++ b/mic/conf.py
@@ -60,10 +60,16 @@ class ConfigMgr(object):
         # reset config options
         self.reset()
 
-        if not siteconf:
-            # initial options from siteconf
+        # initial options from siteconf
+        if siteconf:
+            self._siteconf = siteconf
+        else:
+            # use default site config
             self._siteconf = DEFAULT_GSITECONF
 
+        if ksconf:
+            self._ksconf = ksconf
+
     def reset(self):
         self.__ksconf = None
         self.__siteconf = None