r5414 - trunk/cumin/python/cumin

tmckay at fedoraproject.org tmckay at fedoraproject.org
Thu Jun 14 18:03:34 UTC 2012


Author: tmckay
Date: 2012-06-14 18:03:33 +0000 (Thu, 14 Jun 2012)
New Revision: 5414

Modified:
   trunk/cumin/python/cumin/config.py
Log:
Undo revision 5413


Modified: trunk/cumin/python/cumin/config.py
===================================================================
--- trunk/cumin/python/cumin/config.py	2012-06-14 15:39:26 UTC (rev 5413)
+++ trunk/cumin/python/cumin/config.py	2012-06-14 18:03:33 UTC (rev 5414)
@@ -40,14 +40,7 @@
         paths.append(os.path.join(self.home, "etc", "cumin.conf"))
         paths.append(os.path.join(os.path.expanduser("~"), ".cumin.conf"))
 
-        # If config values reference $CUMIN_HOME, replace with the
-        # resolved value
-        vals = self.parse_files(paths)
-        for sect_key, sect_vals in vals.iteritems():
-            for param, value in sect_vals.iteritems():
-                if type(value) is str and "$CUMIN_HOME" in value:
-                    sect_vals[param] = value.replace("$CUMIN_HOME", self.home)
-        return vals
+        return self.parse_files(paths)
 
 class CuminCommonConfig(CuminConfig):
     '''



More information about the cumin-developers mailing list