summaryrefslogtreecommitdiffstats
path: root/perl-install/install_interactive.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-01-21 13:39:18 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-01-21 13:39:18 +0000
commit046e5756164fcb3dc121c90267cd4ce517173c1a (patch)
tree794d5bdd4154738b731efeff2f68db4ae61660d6 /perl-install/install_interactive.pm
parentedeb25ec8b0ddaa99b6bc799ea38fa5c156a6ced (diff)
downloaddrakx-backup-do-not-use-046e5756164fcb3dc121c90267cd4ce517173c1a.tar
drakx-backup-do-not-use-046e5756164fcb3dc121c90267cd4ce517173c1a.tar.gz
drakx-backup-do-not-use-046e5756164fcb3dc121c90267cd4ce517173c1a.tar.bz2
drakx-backup-do-not-use-046e5756164fcb3dc121c90267cd4ce517173c1a.tar.xz
drakx-backup-do-not-use-046e5756164fcb3dc121c90267cd4ce517173c1a.zip
remove or fix some "Previous"
Diffstat (limited to 'perl-install/install_interactive.pm')
-rw-r--r--perl-install/install_interactive.pm17
1 files changed, 8 insertions, 9 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 {