1.1 --- a/kconfig/conf.c Sat Feb 24 11:00:05 2007 +0000
1.2 +++ b/kconfig/conf.c Tue May 01 16:32:52 2007 +0000
1.3 @@ -557,7 +557,7 @@
1.4 case ask_silent:
1.5 if (stat(".config", &tmpstat)) {
1.6 printf(_("***\n"
1.7 - "*** You have not yet configured your "PROJECT_NAME"!\n"
1.8 + "*** You have not yet configured "PROJECT_NAME"!\n"
1.9 "***\n"
1.10 "*** Please run some configurator (e.g. \"make oldconfig\" or\n"
1.11 "*** \"make menuconfig\" or \"make xconfig\").\n"
1.12 @@ -600,7 +600,7 @@
1.13 input_mode = ask_silent;
1.14 valid_stdin = 1;
1.15 }
1.16 - } else if (sym_change_count) {
1.17 + } else if (conf_get_changed()) {
1.18 name = getenv("KCONFIG_NOSILENTUPDATE");
1.19 if (name && *name) {
1.20 fprintf(stderr, _("\n*** "PROJECT_NAME" configuration requires explicit update.\n\n"));
1.21 @@ -613,11 +613,11 @@
1.22 conf_cnt = 0;
1.23 check_conf(&rootmenu);
1.24 } while (conf_cnt);
1.25 + if (conf_write(NULL)) {
1.26 + fprintf(stderr, _("\n*** Error during writing of "PROJECT_NAME" configuration.\n\n"));
1.27 + return 1;
1.28 + }
1.29 +skip_check:
1.30
1.31 - if (!conf_write(NULL)) {
1.32 -skip_check:
1.33 - return 0;
1.34 - }
1.35 - fprintf(stderr, _("\n*** Error writing "PROJECT_NAME" configuration.\n\n"));
1.36 - return 1;
1.37 + return 0;
1.38 }