diff options
| author | Guido Günther <agx@sigxcpu.org> | 2018-05-24 15:15:29 +0200 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2018-05-24 15:15:29 +0200 |
| commit | a287bf6155747ce8fc17580c11547f6ecc4e7aea (patch) | |
| tree | 92807b86f75b84b4f5a5095dbd32256262f8f9e5 | |
| parent | 28a950abf5a4f3e3838f4620e5dfc36dff850eb8 (diff) | |
config: allow to override default values via add_config_file_option
| -rw-r--r-- | gbp/config.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/gbp/config.py b/gbp/config.py index 09765d8c..e1b2328d 100644 --- a/gbp/config.py +++ b/gbp/config.py @@ -642,8 +642,11 @@ class GbpOptionParser(OptionParser): if not help: help = self.help[option_name] opt_names = self.get_opt_names(option_name) + default = kwargs.pop('default', None) + if default is None: + default = self.get_default(option_name, **kwargs) OptionParser.add_option(self, *opt_names, dest=dest, - default=self.get_default(option_name, **kwargs), + default=default, help=help % self.config, **kwargs) def add_boolean_config_file_option(self, option_name, dest): @@ -736,8 +739,11 @@ class GbpOptionGroup(OptionGroup): if not help: help = self.parser.help[option_name] opt_names = self.parser.get_opt_names(option_name) + default = kwargs.pop('default', None) + if default is None: + default = self.parser.get_default(option_name, **kwargs) OptionGroup.add_option(self, *opt_names, dest=dest, - default=self.parser.get_default(option_name, **kwargs), + default=default, help=help % self.parser.config, **kwargs) def add_boolean_config_file_option(self, option_name, dest): |