summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Stelling <blubb@gentoo.org>2006-04-13 17:59:44 +0000
committerSimon Stelling <blubb@gentoo.org>2006-04-13 17:59:44 +0000
commite5ffe576e032738060f0c9b5ced5e9dc9b065f32 (patch)
tree226971cdaa59fa010d7d0bc6ebe20ee98681fb4c
parent99757d94aab2a1188bbde7d00350bdc6b3d4075b (diff)
downloadportage-e5ffe576e032738060f0c9b5ced5e9dc9b065f32.tar.gz
portage-e5ffe576e032738060f0c9b5ced5e9dc9b065f32.tar.bz2
portage-e5ffe576e032738060f0c9b5ced5e9dc9b065f32.zip
exit if user hits the cancel button in dialog mode; bug 108137
svn path=/main/trunk/; revision=3141
-rwxr-xr-xbin/etc-update4
1 files changed, 2 insertions, 2 deletions
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