summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-02-07 13:09:43 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-02-07 13:09:43 +0000
commit945feb3cae2a9dc2f5fea0a98ea4f212fdbe95ba (patch)
tree1db87a32ed18632128d5bf8ba7cf827dbd212a2b /perl-install
parentaf38b82796a8eed3b6ae0ffbb4850c89ed4e6257 (diff)
downloaddrakx-945feb3cae2a9dc2f5fea0a98ea4f212fdbe95ba.tar
drakx-945feb3cae2a9dc2f5fea0a98ea4f212fdbe95ba.tar.gz
drakx-945feb3cae2a9dc2f5fea0a98ea4f212fdbe95ba.tar.bz2
drakx-945feb3cae2a9dc2f5fea0a98ea4f212fdbe95ba.tar.xz
drakx-945feb3cae2a9dc2f5fea0a98ea4f212fdbe95ba.zip
fix (causing XFdrake to use a combo instead of a list)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/interactive.pm10
1 files changed, 5 insertions, 5 deletions
diff --git a/perl-install/interactive.pm b/perl-install/interactive.pm
index c3c76c0af..4491cc35c 100644
--- a/perl-install/interactive.pm
+++ b/perl-install/interactive.pm
@@ -252,17 +252,17 @@ sub ask_from_normalize {
my ($o, $common, $l) = @_;
foreach my $e (@$l) {
- if (my $l = $e->{list}) {
- if ($e->{sort} || @$l > 10 && !exists $e->{sort}) {
- my @l2 = map { may_apply($e->{format}, $_) } @$l;
+ if (my $li = $e->{list}) {
+ if ($e->{sort} || @$li > 10 && !exists $e->{sort}) {
+ my @l2 = map { may_apply($e->{format}, $_) } @$li;
my @places = sort { $l2[$a] cmp $l2[$b] } 0 .. $#l2;
- $e->{list} = $l = [ map { $l->[$_] } @places ];
+ $e->{list} = $li = [ map { $li->[$_] } @places ];
}
$e->{type} = 'iconlist' if $e->{icon2f};
$e->{type} = 'treelist' if $e->{separator};
add2hash_($e, { not_edit => 1 });
$e->{type} ||= $e->{not_edit} && @$l == 1 ? 'list' : 'combo';
- ${$e->{val}} = $l->[0] if ($e->{type} ne 'combo' || $e->{not_edit}) && !member(${$e->{val}}, @$l);
+ ${$e->{val}} = $li->[0] if ($e->{type} ne 'combo' || $e->{not_edit}) && !member(${$e->{val}}, @$li);
if ($e->{type} eq 'combo' && $e->{format}) {
my @l = map { $e->{format}->($_) } @{$e->{list}};
each_index {