From 66a9e8fab73fbb74892bdba745e4dd31f508f5ab Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Tue, 13 Sep 2005 10:08:16 +0000 Subject: - keyboard::read() now returns false if the value is not recognised - new function keyboard::read_or_default() which always returns a valid value --- perl-install/keyboard.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'perl-install/keyboard.pm') diff --git a/perl-install/keyboard.pm b/perl-install/keyboard.pm index c8cf30e24..5aeb07900 100644 --- a/perl-install/keyboard.pm +++ b/perl-install/keyboard.pm @@ -626,8 +626,9 @@ sub read() { if (!$keyboard{KEYBOARD}) { add2hash(\%keyboard, grep { keyboard2kmap($_) eq $keyboard{KEYTABLE} } keyboards()); } - keyboard2text(\%keyboard) ? \%keyboard : {}; + keyboard2text(\%keyboard) && \%keyboard; } +sub read_or_default() { &read() || default() } sub check() { $^W = 0; -- cgit v1.2.1