From f8883ebcd9ab958fb763329bb3b62f33fba017e1 Mon Sep 17 00:00:00 2001 From: Guido Günther Date: Sun, 2 Feb 2020 18:38:48 +0100 Subject: config: Be less picky about comments after boolean values This makes 'patch-numbers = False # comment' work. Thanks: Mechtilde Stehmann for the report --- gbp/config.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gbp/config.py b/gbp/config.py index 495ec630..1ca8defd 100644 --- a/gbp/config.py +++ b/gbp/config.py @@ -620,12 +620,17 @@ class GbpOptionParser(OptionParser): except KeyError: default = self.config[neg] + default = default.strip() + parts = default.split(" ", 2) + if len(parts) > 1 and parts[1] == '#': + default = parts[0] + if default.lower() in ["true", "1"]: val = 'True' elif default.lower() in ["false", "0"]: val = 'False' else: - raise ValueError("Boolean options must be True or False") + raise ValueError("Boolean options must be True or False, not '%s'" % default) return eval(val) def get_default(self, option_name, **kwargs): -- cgit v1.2.3