aboutsummaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorPatrick Georgi <patrick.georgi@coresystems.de>2010-03-26 10:33:36 +0000
committerPatrick Georgi <patrick.georgi@coresystems.de>2010-03-26 10:33:36 +0000
commit026476e4e3eb0f925b355c079618378248c8e7a2 (patch)
tree93e9216a681ca2d3b77f9264796fe23c704f907a /util
parent0735142bdd2aba4cf47ee5ddde6f9696b55f9791 (diff)
downloadcoreboot-026476e4e3eb0f925b355c079618378248c8e7a2.tar.gz
coreboot-026476e4e3eb0f925b355c079618378248c8e7a2.tar.xz
coreboot-026476e4e3eb0f925b355c079618378248c8e7a2.zip
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
Diffstat (limited to 'util')
-rw-r--r--util/sconfig/config.g4
1 files changed, 2 insertions, 2 deletions
diff --git a/util/sconfig/config.g b/util/sconfig/config.g
index 94c665f15..cdc53a89b 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