Author: justi9 Date: 2010-07-21 15:16:37 -0400 (Wed, 21 Jul 2010) New Revision: 4141 Modified: mgmt/newdata/cumin/python/cumin/config.py Log: Fix config search path; Drop unused config parameter Modified: mgmt/newdata/cumin/python/cumin/config.py =================================================================== --- mgmt/newdata/cumin/python/cumin/config.py 2010-07-21 15:55:06 UTC (rev 4140) +++ mgmt/newdata/cumin/python/cumin/config.py 2010-07-21 19:16:37 UTC (rev 4141) @@ -44,7 +44,7 @@ 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("", "etc", "cumin.conf")) + paths.append(os.path.join(os.sep, "etc", "cumin", "cumin.conf")) return self.parse_files(paths) @@ -58,9 +58,6 @@ param = ConfigParameter(self, "broker", str) param.default = "amqp://localhost" - param = ConfigParameter(self, "model", str) - param.default = os.path.join(self.config.home, "xml") - self.log_file = ConfigParameter(self, "log-file", str) param = ConfigParameter(self, "log-level", str) @@ -75,7 +72,6 @@ self.add_option("--database", default=section.database) self.add_option("--broker", default=section.broker) - self.add_option("--model", default=section.model) self.add_option("--log-file", default=section.log_file) self.add_option("--log-level", default=section.log_level) self.add_option("--debug", action="store_true", default=section.debug)