diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2001-01-30 18:18:13 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2001-01-30 18:18:13 +0000 |
| commit | b69a22cc542a4f20be646ec651f0c294c8d8c8d4 (patch) | |
| tree | 48346a69615b9484b9e7b20fc9dc197ec6f8fd77 | |
| parent | beb1d8377ff12d07ffec259dd240db5014b9a6ee (diff) | |
| download | drakx-b69a22cc542a4f20be646ec651f0c294c8d8c8d4.tar drakx-b69a22cc542a4f20be646ec651f0c294c8d8c8d4.tar.gz drakx-b69a22cc542a4f20be646ec651f0c294c8d8c8d4.tar.bz2 drakx-b69a22cc542a4f20be646ec651f0c294c8d8c8d4.tar.xz drakx-b69a22cc542a4f20be646ec651f0c294c8d8c8d4.zip | |
adapt format functions given to ask_from_listf. $_ is no more set
| -rw-r--r-- | perl-install/install_interactive.pm | 6 | ||||
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/perl-install/install_interactive.pm b/perl-install/install_interactive.pm index fe28f109a..be22710f3 100644 --- a/perl-install/install_interactive.pm +++ b/perl-install/install_interactive.pm @@ -204,14 +204,16 @@ sub partitionWizard { my $level = $::expert ? -9999 : 0; my @sol = grep { $_->[0] >= $level } @solutions; - log::l("solutions found: " . join('', map {$_->[1]} @sol) . " (all solutions found: " . join('', map {$_->[1]} @solutions) . ")"); + log::l( "solutions found: " . join('', map {$_->[1]} @sol) . + " (all solutions found: " . join('', map {$_->[1]} @solutions) . ")"); @solutions = @sol if @sol > 1; log::l("solutions: ", int @solutions); @solutions or $o->ask_warn('', _("I can't find any room for installing")), die 'already displayed'; my $ok; while (!$ok) { - my $sol = $o->ask_from_listf('', _("The DrakX Partitioning wizard found the following solutions:"), sub { $_->[1] }, \@solutions) or redo; + log::l('HERE: ', join(',', map { $_->[1] } @solutions)); + my $sol = $o->ask_from_listf('', _("The DrakX Partitioning wizard found the following solutions:"), sub { $_[0][1] }, \@solutions) or redo; log::l("partitionWizard calling solution $sol->[1]"); eval { $ok = $sol->[2]->() }; die if $@ =~ /setstep/; diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index e2242e0c0..eb16e2565 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -456,7 +456,7 @@ sub choosePackages { } $o->set_help('empty'); $o->ask_from_listf('', _("Select the size you want to install"), - sub { _ ($text[$_[1]], $_[0]) }, \@l, $l[1]) * sqr(1024); + sub { _ ($text[$_[0]], $_[0]) }, \@l, $l[1]) * sqr(1024); } } else { $o->chooseSizeToInstall($packages, $min_size, $def_size, $max_size, $availableC, $individual) || goto &choosePackages; |