diff options
author | Guido Günther <agx@sigxcpu.org> | 2014-02-18 22:54:41 +0100 |
---|---|---|
committer | Guido Günther <agx@sigxcpu.org> | 2014-02-18 23:07:27 +0100 |
commit | 1b0b17c7138617f8a77c4e66b1cc493549e5e0f8 (patch) | |
tree | c0dd8345730e79c4aa63d717c78158b90b7d9ec6 /gbp/config.py | |
parent | 320324b2af233ba06e0b2b2d46394213da10ab1b (diff) |
config: Don't pull in config defaults twice
This would otherwise overwrite values set in the legacy config sections.
Closes: #733759
Diffstat (limited to 'gbp/config.py')
-rw-r--r-- | gbp/config.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gbp/config.py b/gbp/config.py index e465ced..d4c0e5a 100644 --- a/gbp/config.py +++ b/gbp/config.py @@ -330,7 +330,9 @@ class GbpOptionParser(OptionParser): for prefix in ['gbp', 'git']: oldcmd = '%s-%s' % (prefix, self.command) if parser.has_section(oldcmd): - self.config.update(dict(parser.items(oldcmd, raw=True))) + # Don't use items() until we got rid of the compat sections + # since this pulls in the defaults again + self.config.update(dict(parser._sections[cmd].items())) cmd = self.command # Update with command specific settings |