diff options
| -rw-r--r-- | perl-install/install_interactive.pm | 17 | ||||
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 15 |
2 files changed, 17 insertions, 15 deletions
diff --git a/perl-install/install_interactive.pm b/perl-install/install_interactive.pm index a8143117d..316f57031 100644 --- a/perl-install/install_interactive.pm +++ b/perl-install/install_interactive.pm @@ -249,15 +249,14 @@ sub partitionWizard { @solutions or $o->ask_warn('', N("I can't find any room for installing")), die 'already displayed'; log::l('HERE: ', join(',', map { $_->[1] } @solutions)); - if (my $sol = $o->ask_from_listf('', N("The DrakX Partitioning wizard found the following solutions:"), sub { $_[0][1] }, \@solutions)) { - log::l("partitionWizard calling solution $sol->[1]"); - my $ok = eval { $sol->[2]->() }; - $@ and $o->ask_warn('', N("Partitioning failed: %s", $@)); - $ok or goto &partitionWizard; - 1; - } else { - 0; - } + my $sol; + $o->ask_from('', N("The DrakX Partitioning wizard found the following solutions:"), + [ { val => \$sol, list => \@solutions, format => sub { $_[0][1] }, type => 'list' } ]); + log::l("partitionWizard calling solution $sol->[1]"); + my $ok = eval { $sol->[2]->() }; + $@ and $o->ask_warn('', N("Partitioning failed: %s", $@)); + $ok or goto &partitionWizard; + 1; } sub upNetwork { diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index dfa11e34c..20b497310 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -159,10 +159,13 @@ sub selectMouse { $force ||= $o->{mouse}{unsafe}; - my $prev = $o->{mouse}{type} . '|' . $o->{mouse}{name}; - $o->{mouse} = mouse::fullname2mouse( - $o->ask_from_treelist_('', N("Please choose your type of mouse."), - '|', [ mouse::fullnames() ], $prev) || return) if $force; + if ($force) { + my $prev = $o->{mouse}{type} . '|' . $o->{mouse}{name}; + + $o->ask_from('', N("Please choose your type of mouse."), + [ { list => [ mouse::fullnames() ], separator => '|', val => \$prev } ]); + $o->{mouse} = mouse::fullname2mouse($prev); + } if ($force && $o->{mouse}{type} eq 'serial') { $o->set_help('selectSerialPort'); @@ -170,7 +173,7 @@ sub selectMouse { $o->ask_from_listf(N("Mouse Port"), N("Please choose which serial port your mouse is connected to."), \&mouse::serial_port2text, - [ mouse::serial_ports() ]) or return; + [ mouse::serial_ports() ]) or return &selectMouse; } if (arch() =~ /ppc/ && $o->{mouse}{nbuttons} == 1) { #- set a sane default F11/F12 @@ -1108,7 +1111,7 @@ sub miscellaneous { my ($o, $_clicked) = @_; require security::level; - security::level::level_choose($o, \$o->{security}, \$o->{libsafe}, \$o->{security_user}) or return; + security::level::level_choose($o, \$o->{security}, \$o->{libsafe}, \$o->{security_user}); install_steps::miscellaneous($o); } |