Catch ConfigParser.Error when reading config

Change-Id: I8ce04f7c9200ce02df62526144bf9a1dd9d13144

diff --git a/gitbuildsys/conf.py b/gitbuildsys/conf.py
index 2852271..1ed756a 100644 (file)
--- a/gitbuildsys/conf.py
+++ b/gitbuildsys/conf.py
@@ -25,7 +25,7 @@ import ast
 import base64
 import shutil
 from ConfigParser import SafeConfigParser, NoSectionError, NoOptionError, \
-                         MissingSectionHeaderError
+                         MissingSectionHeaderError, Error
 
 from gitbuildsys import msger, errors
 from gitbuildsys.safe_url import SafeURL
@@ -252,7 +252,7 @@ url = http://download.tizen.org/snapshots/trunk/common/latest/
             cfgparser = BrainConfigParser()
             try:
                 cfgparser.read_one(fpath)
-            except MissingSectionHeaderError, err:
+            except Error, err:
                 raise errors.ConfigError('config file error:%s' % err)
             self._cfgparsers.append(cfgparser)
         self._check_passwd()

diff --git a/tests/test_config.py b/tests/test_config.py
index 6144198..14244a5 100644 (file)
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -129,6 +129,11 @@ class ConfigGettingTest(unittest.TestCase):
         'test invalid ini'
         self.assertRaises(ConfigError, reload, gitbuildsys.conf)
 
+    @Fixture(home='invalid_continuation_line.ini')
+    def test_invalid_continuation_line(self):
+        'test invalid cointinuation line'
+        self.assertRaises(ConfigError, reload, gitbuildsys.conf)
+
 
 if __name__ == '__main__':
     unittest.main()
\ No newline at end of file

diff --git a/tests/testdata/ini/invalid_continuation_line.ini b/tests/testdata/ini/invalid_continuation_line.ini
new file mode 100644 (file)
index 0000000..5bee728
--- /dev/null
+++ b/tests/testdata/ini/invalid_continuation_line.ini
@@ -0,0 +1,2 @@
+[general]
+ profile = test
\ No newline at end of file