public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Li Zefan <lizf@cn.fujitsu.com>
To: Michal Marek <mmarek@suse.cz>
Cc: Arnaud Lacombe <lacombar@gmail.com>,
	Davidlohr Bueso <dave@gnu.org>,
	LKML <linux-kernel@vger.kernel.org>,
	linux-kbuild@vger.kernel.org
Subject: [PATCH] kconfig: fix a regression when exiting menuconfig without saving
Date: Mon, 16 Jan 2012 15:01:29 +0800	[thread overview]
Message-ID: <4F13CB49.8030004@cn.fujitsu.com> (raw)

$ 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@gnu.org>
	Date:   Sun Aug 21 22:04:09 2011 -0300

	    kconfig: handle SIGINT in menuconfig

Signed-off-by: Li Zefan <lizf@cn.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

             reply	other threads:[~2012-01-16  6:59 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-01-16  7:01 Li Zefan [this message]
2012-01-16  7:20 ` [PATCH] kconfig: fix a regression when exiting menuconfig without saving Cong Wang
2012-01-16  7:30   ` Li Zefan
2012-01-16  7:57     ` [PATCH] menuconfig: fix a regression when canceling the prompt dialog at exit Li Zefan
2012-01-16  8:05       ` Wang YanQing
2012-01-16 13:44       ` Michal Marek

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4F13CB49.8030004@cn.fujitsu.com \
    --to=lizf@cn.fujitsu.com \
    --cc=dave@gnu.org \
    --cc=lacombar@gmail.com \
    --cc=linux-kbuild@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mmarek@suse.cz \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox