From b6c0e2e4fdf67ff50977cdd185536f37fe894ccb Mon Sep 17 00:00:00 2001
From: Sergei Trofimov <sergei.trofimov@arm.com>
Date: Thu, 14 Apr 2016 16:18:31 +0100
Subject: [PATCH] boostrap: nicer error messages on config parasing.

- handle ValueError as well as SyntaxError from config parser
- Report source file in the error message
---
 wlauto/core/bootstrap.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wlauto/core/bootstrap.py b/wlauto/core/bootstrap.py
index dcc8dee0..812cd767 100644
--- a/wlauto/core/bootstrap.py
+++ b/wlauto/core/bootstrap.py
@@ -114,8 +114,8 @@ class ConfigLoader(object):
                 new_config = load_struct_from_yaml(source)
             else:
                 raise ConfigError('Unknown config format: {}'.format(source))
-        except LoadSyntaxError as e:
-            raise ConfigError(e)
+        except (LoadSyntaxError, ValueError) as e:
+            raise ConfigError('Invalid config "{}":\n\t{}'.format(source, e))
 
         self._config = merge_dicts(self._config, new_config,
                                    list_duplicates='first',