summaryrefslogtreecommitdiffstats
path: root/perl-install/interactive.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-02-03 19:15:20 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-02-03 19:15:20 +0000
commit4fb359379d79b1adc17d6f94815ac08691a411d2 (patch)
tree471467d0967ba4b663e286195bcc4703797ef2b3 /perl-install/interactive.pm
parent31641090b339410f7b61a9aaaa25d641eb12e4f7 (diff)
downloaddrakx-4fb359379d79b1adc17d6f94815ac08691a411d2.tar
drakx-4fb359379d79b1adc17d6f94815ac08691a411d2.tar.gz
drakx-4fb359379d79b1adc17d6f94815ac08691a411d2.tar.bz2
drakx-4fb359379d79b1adc17d6f94815ac08691a411d2.tar.xz
drakx-4fb359379d79b1adc17d6f94815ac08691a411d2.zip
since "format" is now handled for combo boxes, combo boxes are used in much too many places. Fix this by forcing type "list" for some cases, and using type "list" when a ask_from has only one entry
Diffstat (limited to 'perl-install/interactive.pm')
-rw-r--r--perl-install/interactive.pm3
1 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/interactive.pm b/perl-install/interactive.pm
index a9d98c9f4..c3c76c0af 100644
--- a/perl-install/interactive.pm
+++ b/perl-install/interactive.pm
@@ -260,7 +260,8 @@ sub ask_from_normalize {
}
$e->{type} = 'iconlist' if $e->{icon2f};
$e->{type} = 'treelist' if $e->{separator};
- add2hash_($e, { not_edit => 1, type => 'combo' });
+ 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);
if ($e->{type} eq 'combo' && $e->{format}) {
my @l = map { $e->{format}->($_) } @{$e->{list}};