From 026476e4e3eb0f925b355c079618378248c8e7a2 Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Fri, 26 Mar 2010 10:33:36 +0000 Subject: Make sconfig only complain about real conflicts. Signed-off-by: Patrick Georgi Acked-by: Stefan Reinauer git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5301 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- util/sconfig/config.g | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/util/sconfig/config.g b/util/sconfig/config.g index 94c665f15e..cdc53a89b9 100644 --- a/util/sconfig/config.g +++ b/util/sconfig/config.g @@ -602,8 +602,8 @@ def getdict(dict, name): def setdict(dict, name, value): debug.info(debug.dict, "setdict sets %s to %s" % (name, value)) - if name in dict.keys(): - print "Duplicate in dict: %s" % name + if name in dict.keys() and not dict[name] == value: + print "Collision in dict: %s is %s, shall be set to %s" % (name, dict[name], value) dict[name] = value -- cgit v1.2.3