From 8e5fd929e2e5fd3dca7d883744346f76fd37b377 Mon Sep 17 00:00:00 2001
From: Marc Bonnici <marc.bonnici@arm.com>
Date: Fri, 9 Jun 2017 10:19:26 +0100
Subject: [PATCH] Core: Fixes error message for invalid config

Previously only an incorrect error message was generated without actually being
raised.
---
 wa/framework/configuration/core.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/wa/framework/configuration/core.py b/wa/framework/configuration/core.py
index b1af03a9..5114f6ad 100644
--- a/wa/framework/configuration/core.py
+++ b/wa/framework/configuration/core.py
@@ -942,9 +942,8 @@ class JobSpec(Configuration):
                     cfg_point.set_value(workload_params, value, 
                                         check_mandatory=False)
             if config:
-                msg = 'conflicting entry(ies) for "{}" in {}: "{}"'
-                msg = msg.format(self.workload_name, source.name,
-                                    '", "'.join(workload_params[source]))
+                msg = 'Unexpected config "{}" for "{}"'
+                raise ConfigError(msg.format(config, self.workload_name))
 
         self.workload_parameters = workload_params