[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <4F13CB49.8030004@cn.fujitsu.com>
Date: Mon, 16 Jan 2012 15:01:29 +0800
From: Li Zefan <lizf@...fujitsu.com>
To: Michal Marek <mmarek@...e.cz>
CC: Arnaud Lacombe <lacombar@...il.com>,
Davidlohr Bueso <dave@....org>,
LKML <linux-kernel@...r.kernel.org>, linux-kbuild@...r.kernel.org
Subject: [PATCH] kconfig: fix a regression when exiting menuconfig without
saving
$ make menuconfig
HOSTCC scripts/kconfig/mconf.o
HOSTLD scripts/kconfig/mconf
scripts/kconfig/mconf Kconfig
Your configuration changes were NOT saved.
make[1]: *** [menuconfig] Error 1
make: *** [menuconfig] Error 2
Exiting menuconfig without saving, make will report error.
This is a regression, and was introduced by
commit 564899f9f0a2df85fa367c8749a1fef323cb3215
Author: Davidlohr Bueso <dave@....org>
Date: Sun Aug 21 22:04:09 2011 -0300
kconfig: handle SIGINT in menuconfig
Signed-off-by: Li Zefan <lizf@...fujitsu.com>
---
scripts/kconfig/mconf.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c
index 19e200d..2c6286c 100644
--- a/scripts/kconfig/mconf.c
+++ b/scripts/kconfig/mconf.c
@@ -830,6 +830,8 @@ static int handle_exit(void)
fprintf(stderr, _("\n\n"
"Your configuration changes were NOT saved."
"\n\n"));
+ if (res != KEY_ESC)
+ res = 0;
}
return res;
--
1.7.3.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists