summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps_interactive.pm
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-05-26 05:23:24 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-05-26 05:23:24 +0000
commit15459009833f8cb01fbb9b6fe00d1b65822d1e57 (patch)
tree06b24e3ad2e596e560581219ecfd42de443c814f /perl-install/install_steps_interactive.pm
parent7f26f4486207e8775f6e1d5df5658687737368fb (diff)
downloaddrakx-15459009833f8cb01fbb9b6fe00d1b65822d1e57.tar
drakx-15459009833f8cb01fbb9b6fe00d1b65822d1e57.tar.gz
drakx-15459009833f8cb01fbb9b6fe00d1b65822d1e57.tar.bz2
drakx-15459009833f8cb01fbb9b6fe00d1b65822d1e57.tar.xz
drakx-15459009833f8cb01fbb9b6fe00d1b65822d1e57.zip
More refactorisation
Diffstat (limited to 'perl-install/install_steps_interactive.pm')
-rw-r--r--perl-install/install_steps_interactive.pm10
1 files changed, 5 insertions, 5 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 1d5189fdb..408021516 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -655,12 +655,12 @@ sub chooseCD {
my %mediumsDescr;
#- the boot medium is already selected.
- $mediumsDescr{pkgs::mediumDescr($packages, $install_any::boot_medium)} = 1;
+ $mediumsDescr{install_medium::by_id($install_any::boot_medium, $packages)->{descr}} = 1;
- #- build mediumDescr according to mediums, this avoids asking multiple times
+ #- build mediumsDescr according to mediums, this avoids asking multiple times
#- all the media grouped together on only one CD.
foreach (@mediums) {
- my $descr = pkgs::mediumDescr($packages, $_);
+ my $descr = install_medium::by_id($_, $packages)->{descr};
$packages->{mediums}{$_}->ignored and next;
exists $mediumsDescr{$descr} or push @mediumsDescr, $descr;
$mediumsDescr{$descr} ||= $packages->{mediums}{$_}->selected;
@@ -692,7 +692,7 @@ If only some CDs are missing, unselect them, then click Ok."),
#- restore true selection of medium (which may have been grouped together)
foreach (@mediums) {
$packages->{mediums}{$_}->ignored and next;
- my $descr = pkgs::mediumDescr($packages, $_);
+ my $descr = install_medium::by_id($_, $packages)->{descr};
if ($mediumsDescr{$descr}) {
$packages->{mediums}{$_}->select;
} else {
@@ -730,7 +730,7 @@ sub installPackages {
#- if not using a cdrom medium or an iso image, always abort.
return if !install_any::method_allows_medium_change($method);
- my $name = pkgs::mediumDescr($o->{packages}, $medium);
+ my $name = install_medium::by_id($medium, $o->{packages})->{descr};
local $| = 1; print "\a";
my $r = $name !~ /commercial/i || ($o->{useless_thing_accepted2} ||= $o->ask_from_list_('', formatAlaTeX(install_messages::com_license()), [ N_("Accept"), N_("Refuse") ], "Accept") eq "Accept");
if ($method =~ /-iso$/) {