From: Simon Stelling <blubb@gentoo.org>
Date: Thu, 13 Apr 2006 17:59:44 +0000 (-0000)
Subject: exit if user hits the cancel button in dialog mode; bug 108137
X-Git-Tag: v2.1_pre9~27
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e5ffe576e032738060f0c9b5ced5e9dc9b065f32;p=portage.git

exit if user hits the cancel button in dialog mode; bug 108137

svn path=/main/trunk/; revision=3141
---

diff --git a/bin/etc-update b/bin/etc-update
index f39801894..a8bf13325 100755
--- a/bin/etc-update
+++ b/bin/etc-update
@@ -139,7 +139,7 @@ configuration file is followed by a list of possible replacement files."
 			else
 				dialog --title "${title}" --menu "${my_title}" \
 					0 0 0 $(echo -e "-1 Exit\n$(<${TMP}/menuitems)") \
-					2> ${TMP}/input
+					2> ${TMP}/input || die "User termination!" 0
 				input=$(<${TMP}/input)
 			fi
 			if (( ${input} == -5 )); then
@@ -193,7 +193,7 @@ function do_file() {
 				else
 					dialog --title "${title}" --menu "${my_title}" \
 						0 0 0 `echo -e "$(<${TMP}/menuitems)\n${fcount} Exit"` \
-						2> ${TMP}/input
+						2> ${TMP}/input || die "User termination!" 0
 					my_input=$(<${TMP}/input)
 				fi
 			fi # OVERWRITE_ALL