From 1d27dbf5e28c61be9eeb078c44f2481fb25e7195 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Tue, 20 Feb 2001 01:09:07 +0000
Subject: major move. now ask_from_list returns false when canceled (it doesn't
 die 'ask_from_list canceled' anymore)

---
 perl-install/standalone/keyboarddrake | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'perl-install/standalone/keyboarddrake')

diff --git a/perl-install/standalone/keyboarddrake b/perl-install/standalone/keyboarddrake
index 6a0b86d86..6e89d353e 100755
--- a/perl-install/standalone/keyboarddrake
+++ b/perl-install/standalone/keyboarddrake
@@ -28,7 +28,7 @@ $keyboard ||= $in->ask_from_listf_(_("Keyboard"),
 				   _("Please, choose your keyboard layout."),
 				   \&keyboard::keyboard2text,
 				   [ keyboard::keyboards() ],
-				   keyboard::read());
+				   keyboard::read()) or $in->exit(0);
 
 keyboard::keyboard2text($keyboard) or die "bad keyboard $keyboard\n";
 
@@ -61,6 +61,10 @@ substInFile {
 
 keyboard::write('', $keyboard, $isNotDelete);
 
-$::isEmbedded ? kill(USR1, $::CCPID) : $in->exit(0);
-$keyboard='';
-goto begin;
+if ($::isEmbedded) {
+    kill(USR1, $::CCPID);
+    $keyboard = '';
+    goto begin;
+} else {
+    $in->exit(0);
+}
-- 
cgit v1.2.1