diff options
| author | Brian Dolbec <dolsen@gentoo.org> | 2012-04-13 19:13:42 -0700 |
|---|---|---|
| committer | Brian Dolbec <dolsen@gentoo.org> | 2012-04-13 19:13:42 -0700 |
| commit | 9ec59c4d881960ce0e1f7c2fdc55bad471a8d7b7 (patch) | |
| tree | 63e91ab03832ab43fb668cbe08d5cb1a5a70f203 | |
| parent | b7b7df1489d582443462d88dfa0ce86a35caf4af (diff) | |
| download | layman-9ec59c4d881960ce0e1f7c2fdc55bad471a8d7b7.tar.gz layman-9ec59c4d881960ce0e1f7c2fdc55bad471a8d7b7.tar.bz2 layman-9ec59c4d881960ce0e1f7c2fdc55bad471a8d7b7.zip | |
fix the BareConfig not str sub'ing %(configdir)s before calling read_config(). indent fix in read_config().
| -rw-r--r-- | layman/config.py | 13 |
1 files 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): |