From 9ec59c4d881960ce0e1f7c2fdc55bad471a8d7b7 Mon Sep 17 00:00:00 2001 From: Brian Dolbec Date: Fri, 13 Apr 2012 19:13:42 -0700 Subject: fix the BareConfig not str sub'ing %(configdir)s before calling read_config(). indent fix in read_config(). --- layman/config.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/layman/config.py b/layman/config.py index 0541d92..8430221 100644 --- a/layman/config.py +++ b/layman/config.py @@ -151,13 +151,18 @@ class BareConfig(object): self._set_quietness(quietness) self.config = None if read_configfile: - self.read_config(self.get_defaults()) + defaults = self.get_defaults() + if "%(configdir)s" in defaults['config']: + # fix the config path + defaults['config'] = defaults['config'] \ + % {'configdir': defaults['configdir']} + self.read_config(defaults) def read_config(self, defaults): - self.config = ConfigParser.ConfigParser(defaults) - self.config.add_section('MAIN') - read_layman_config(self.config, defaults) + self.config = ConfigParser.ConfigParser(defaults) + self.config.add_section('MAIN') + read_layman_config(self.config, defaults) def keys(self): -- cgit v1.2.3-1-g7c22