config: allow adding config file arg without help

Previously, adding a config file arg with no help resulted in KeyError
if no default help text was defined. Now, it is possible to add a config
arg without a help text. This makes the argument parser more consistent
as adding "non-conf-file-args" requires no help text, either.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>

gbp/config.py

@@ -655,7 +655,7 @@ def add_conf_file_arg(self, *args, **kwargs):
         else:
             kwargs['default'] = self.config.get_value(name)
         self.conf_file_args.add(name)
-        if 'help' not in kwargs:
+        if 'help' not in kwargs and name in self.config.default_helps:
             kwargs['help'] = self.config.default_helps[name]
         new_arg = self.add_arg(*args, **kwargs)
 

tests/doctests/test_Config.py

@@ -29,10 +29,6 @@ def test_option_parser_debian():
 
     >>> import gbp.config
     >>> c = gbp.config.GbpConfArgParserDebian.create_parser(prog='debian')
-    >>> c.add_conf_file_arg('--builder', dest='builder')
-    Traceback (most recent call last):
-    ...
-    KeyError: 'builder'
     >>> c.add_conf_file_arg('--builder', dest='builder', help='foo')
     """