Author: tmckay
Date: 2010-09-24 11:37:19 -0400 (Fri, 24 Sep 2010)
New Revision: 4341
Modified:
mgmt/newdata/cumin/python/cumin/config.py
Log:
Reverse the order in which cumin.conf files are parsed. This allows local cumin.conf
files to override system wide files. Previously, users' local configurations would be
overwritten by system wide configurations.
Modified: mgmt/newdata/cumin/python/cumin/config.py
===================================================================
--- mgmt/newdata/cumin/python/cumin/config.py 2010-09-24 15:31:20 UTC (rev 4340)
+++ mgmt/newdata/cumin/python/cumin/config.py 2010-09-24 15:37:19 UTC (rev 4341)
@@ -47,9 +47,9 @@
def parse(self):
paths = list()
+ paths.append(os.path.join(os.sep, "etc", "cumin",
"cumin.conf"))
+ paths.append(os.path.join(self.home, "etc", "cumin.conf"))
paths.append(os.path.join(os.path.expanduser("~"),
".cumin.conf"))
- paths.append(os.path.join(self.home, "etc", "cumin.conf"))
- paths.append(os.path.join(os.sep, "etc", "cumin",
"cumin.conf"))
return self.parse_files(paths)