diff options
author | Pascal Rigaux <pixel@mandriva.com> | 2002-02-15 13:25:18 +0000 |
---|---|---|
committer | Pascal Rigaux <pixel@mandriva.com> | 2002-02-15 13:25:18 +0000 |
commit | 6f6740ad5cc6c0d60440c8a2cece76b9c7b2bf0c (patch) | |
tree | 493c20d81d80b0d890c37faad95e88c5621e64b9 | |
parent | ac68b39c49bed1cd7e4109a60fc8175b0e5a5651 (diff) | |
download | drakx-6f6740ad5cc6c0d60440c8a2cece76b9c7b2bf0c.tar drakx-6f6740ad5cc6c0d60440c8a2cece76b9c7b2bf0c.tar.gz drakx-6f6740ad5cc6c0d60440c8a2cece76b9c7b2bf0c.tar.bz2 drakx-6f6740ad5cc6c0d60440c8a2cece76b9c7b2bf0c.tar.xz drakx-6f6740ad5cc6c0d60440c8a2cece76b9c7b2bf0c.zip |
favour "combo" over "list" in any case
-rw-r--r-- | perl-install/interactive.pm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/interactive.pm b/perl-install/interactive.pm index bf3a818b0..b0bab6637 100644 --- a/perl-install/interactive.pm +++ b/perl-install/interactive.pm @@ -261,7 +261,7 @@ sub ask_from_normalize { $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->{type} ||= 'combo'; ${$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}}; |