From 4d3abeb78368762d061eee9ca00c30dad762a15d Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 3 Jan 2008 23:33:44 +0100 Subject: [PATCH] --- yaml --- r: 77963 b: refs/heads/master c: d84876f9f8042d5536050b83674c4f348ca3c4df h: refs/heads/master i: 77961: b073e9632cd3357ac1e685b3d67c83eb7e457e41 77959: 37287de6c1a5d9e3861751d9cd78fb5244062152 v: v3 --- [refs] | 2 +- trunk/scripts/kconfig/confdata.c | 14 +++++--------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 68505cac955b..65e76c5835c2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 09af091f50409a60a72086c737b9a6224dde5ab8 +refs/heads/master: d84876f9f8042d5536050b83674c4f348ca3c4df diff --git a/trunk/scripts/kconfig/confdata.c b/trunk/scripts/kconfig/confdata.c index e0f402f3b75d..2eccefb03a93 100644 --- a/trunk/scripts/kconfig/confdata.c +++ b/trunk/scripts/kconfig/confdata.c @@ -232,8 +232,7 @@ int conf_read_simple(const char *name, int def) sym->type = S_BOOLEAN; } if (sym->flags & def_flags) { - conf_warning("trying to reassign symbol %s", sym->name); - break; + conf_warning("override: reassigning to symbol %s", sym->name); } switch (sym->type) { case S_BOOLEAN: @@ -272,8 +271,7 @@ int conf_read_simple(const char *name, int def) sym->type = S_OTHER; } if (sym->flags & def_flags) { - conf_warning("trying to reassign symbol %s", sym->name); - break; + conf_warning("override: reassigning to symbol %s", sym->name); } if (conf_set_sym_val(sym, def, def_flags, p)) continue; @@ -297,11 +295,9 @@ int conf_read_simple(const char *name, int def) } break; case yes: - if (cs->def[def].tri != no) { - conf_warning("%s creates inconsistent choice state", sym->name); - cs->flags &= ~def_flags; - } else - cs->def[def].val = sym; + if (cs->def[def].tri != no) + conf_warning("override: %s changes choice state", sym->name); + cs->def[def].val = sym; break; } cs->def[def].tri = E_OR(cs->def[def].tri, sym->def[def].tri);