summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-08-21 15:03:20 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-08-21 15:03:20 +0000
commit838ab8898a7aba05891ba8e421712ffe0c6d1c79 (patch)
tree0b84c89bccfa98916641ec42a339dbc32ca02cc7
parent8d7175569e8152e263f438796b25978e7e24b0f4 (diff)
downloaddrakx-838ab8898a7aba05891ba8e421712ffe0c6d1c79.tar
drakx-838ab8898a7aba05891ba8e421712ffe0c6d1c79.tar.gz
drakx-838ab8898a7aba05891ba8e421712ffe0c6d1c79.tar.bz2
drakx-838ab8898a7aba05891ba8e421712ffe0c6d1c79.tar.xz
drakx-838ab8898a7aba05891ba8e421712ffe0c6d1c79.zip
- ensure we don't default on the first keyboard layout when upgrading french
box in english lang (#41103)
-rw-r--r--perl-install/install/NEWS2
-rw-r--r--perl-install/install/steps_interactive.pm3
2 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 6abb700c7..5b5b8338e 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- ensure we don't default on the first keyboard layout when upgrading french
+ box in english lang (#41103)
- do not set $HOME while installing packages (#18088)
Version 11.20 - 20 August 2008
diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm
index 3845e647c..52e7bfe1e 100644
--- a/perl-install/install/steps_interactive.pm
+++ b/perl-install/install/steps_interactive.pm
@@ -85,7 +85,8 @@ sub selectKeyboard {
if ($clicked || !($from_usb || @$l && $l->[0][1] >= 90) || listlength(lang::langs($o->{locale}{langs})) > 1) {
add2hash($o->{keyboard}, $from_usb);
- my @best = uniq($from_usb ? $from_usb->{KEYBOARD} : (), map { $_->[0] } @$l);
+ my @best = uniq(grep { $_ } $from_usb && $from_usb->{KEYBOARD}, $o->{keyboard}{KEYBOARD},
+ map { $_->[0] } @$l);
@best = () if @best == 1;
my $format = sub { translate(keyboard::KEYBOARD2text($_[0])) };