diff options
| author | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2007-04-15 16:45:11 +0000 |
|---|---|---|
| committer | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2007-04-15 16:45:11 +0000 |
| commit | afaffaea3892b0d2af9269e10a2d9e09a95174f2 (patch) | |
| tree | 064c98815470434478c33fc486220b8c8357d368 /kconfig/conf.c | |
| parent | 5fbbd29ee62ba971d4660a409d3d763c2617eae9 (diff) | |
| download | crosstool-ng-afaffaea3892b0d2af9269e10a2d9e09a95174f2.tar.gz crosstool-ng-afaffaea3892b0d2af9269e10a2d9e09a95174f2.tar.bz2 crosstool-ng-afaffaea3892b0d2af9269e10a2d9e09a95174f2.zip | |
Update to latest kconfig from linux-2.6.20.7.
I'm not sure of the improvements, but at least we're up-to-date, and updating in the future will be easier.
Diffstat (limited to 'kconfig/conf.c')
| -rw-r--r-- | kconfig/conf.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/kconfig/conf.c b/kconfig/conf.c index 1b5b5d51..63c75426 100644 --- a/kconfig/conf.c +++ b/kconfig/conf.c @@ -557,7 +557,7 @@ int main(int ac, char **av) case ask_silent: if (stat(".config", &tmpstat)) { printf(_("***\n" - "*** You have not yet configured your "PROJECT_NAME"!\n" + "*** You have not yet configured "PROJECT_NAME"!\n" "***\n" "*** Please run some configurator (e.g. \"make oldconfig\" or\n" "*** \"make menuconfig\" or \"make xconfig\").\n" @@ -600,7 +600,7 @@ int main(int ac, char **av) input_mode = ask_silent; valid_stdin = 1; } - } else if (sym_change_count) { + } else if (conf_get_changed()) { name = getenv("KCONFIG_NOSILENTUPDATE"); if (name && *name) { fprintf(stderr, _("\n*** "PROJECT_NAME" configuration requires explicit update.\n\n")); @@ -613,11 +613,11 @@ int main(int ac, char **av) conf_cnt = 0; check_conf(&rootmenu); } while (conf_cnt); - - if (!conf_write(NULL)) { -skip_check: - return 0; + if (conf_write(NULL)) { + fprintf(stderr, _("\n*** Error during writing of "PROJECT_NAME" configuration.\n\n")); + return 1; } - fprintf(stderr, _("\n*** Error writing "PROJECT_NAME" configuration.\n\n")); - return 1; +skip_check: + + return 0; } |