From cb3afbddbc98accde27da668b88ce12790677bc6 Mon Sep 17 00:00:00 2001 From: Francois Pons Date: Fri, 21 Sep 2001 15:05:48 +0000 Subject: reworked medium management. --- perl-install/install_steps_gtk.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'perl-install/install_steps_gtk.pm') diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm index a00fb8001..bed787d04 100644 --- a/perl-install/install_steps_gtk.pm +++ b/perl-install/install_steps_gtk.pm @@ -344,7 +344,7 @@ sub choosePackagesTree { }, node_state => sub { my $p = pkgs::packageByName($packages,$_[0]) or return; - pkgs::packageMedium($p)->{selected} or return; + pkgs::packageMedium($packages, $p)->{selected} or return; pkgs::packageFlagBase($p) and return 'base'; pkgs::packageFlagInstalled($p) and return 'installed'; pkgs::packageFlagSelected($p) and return 'selected'; @@ -376,7 +376,7 @@ sub choosePackagesTree { }, get_info => sub { my $p = pkgs::packageByName($packages, $_[0]) or return ''; - pkgs::extractHeaders($o->{prefix}, [$p], pkgs::packageMedium($p)); + pkgs::extractHeaders($o->{prefix}, [$p], pkgs::packageMedium($packages, $p)); pkgs::packageHeader($p) or die; my $imp = translate($pkgs::compssListDesc{pkgs::packageFlagBase($p) ? @@ -603,7 +603,7 @@ Please insert the Cd-Rom labelled \"%s\" in your drive and press Ok when done. If you don't have it, press Cancel to avoid installation from this Cd-Rom.", $name), 1); #- add the elapsed time (otherwise the predicted time will be rubbish) $start_time += time() - $time; - $r; + return $r; }; }; my $install_result; -- cgit v1.2.1