Make sconfig only complain about real conflicts.

Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5301 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/util/sconfig/config.g b/util/sconfig/config.g
index 94c665f15e873b0716731ba8c75e4c9e094adfcc..cdc53a89b937e4319b3064438280329283e6890e 100644 (file)
--- 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