Give more instructions when config is unparseable

and make return codes and messages consistent. This allows us to move
some test code from the component tests to the unit tests which is
always nice.

Closes: #733640

1 files changed, 6 insertions, 1 deletions

diff --git a/gbp/config.py b/gbp/config.py
index 3afd3a1f..a079447e 100644
--- a/gbp/config.py
+++ b/gbp/config.py
@@ -23,6 +23,7 @@ import errno
 import os.path
 import sys
 
+from gbp.errors import GbpError
 
 try:
     from gbp.version import gbp_version
@@ -509,9 +510,13 @@ class GbpOptionParser(OptionParser):
         self.sections = sections
         self.prefix = prefix
         self.config = {}
-        self.parse_config_files()
         self.valid_options = []
 
+        try:
+            self.parse_config_files()
+        except configparser.ParsingError as err:
+            raise GbpError(str(err) + "\nSee 'man gbp.conf' for the format.")
+
         OptionParser.__init__(self, option_class=GbpOption,
                               prog="gbp %s" % self.command,
                               usage=usage, version='%s %s' % (self.command,