config: Don't pull in config defaults twice

This would otherwise overwrite values set in the legacy config sections.

Closes: #733759

diff --git a/gbp/config.py b/gbp/config.py
index e465cede88d14c7ad20b3939e6e626b74d28a3b0..d4c0e5ad7a6a50aef09aad0f99a8939890489c5d 100644 (file)
--- 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