[commit] r5301 - trunk/util/sconfig

[repository service]

Author: oxygene
Date: Fri Mar 26 11:33:36 2010
New Revision: 5301
URL: https://tracker.coreboot.org/trac/coreboot/changeset/5301

Log:
Make sconfig only complain about real conflicts.


Signed-off-by: Patrick Georgi <[e-mail]>
Acked-by: Stefan Reinauer <[e-mail]>

Modified:
   trunk/util/sconfig/config.g

Modified: trunk/util/sconfig/config.g
==============================================================================
--- trunk/util/sconfig/config.g	Fri Mar 26 02:43:30 2010	(r5300)
+++ trunk/util/sconfig/config.g	Fri Mar 26 11:33:36 2010	(r5301)
@@ -602,8 +602,8 @@
 
 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