diff options
| author | Francois Pons <fpons@mandriva.com> | 2001-09-21 15:05:48 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2001-09-21 15:05:48 +0000 |
| commit | cb3afbddbc98accde27da668b88ce12790677bc6 (patch) | |
| tree | 49223fa570630e472f1873fc97ceac7513a9dfae /perl-install/install_steps_gtk.pm | |
| parent | 822e38049c9c4bbfbd72eb0c9f9cc6f2129506e6 (diff) | |
| download | drakx-cb3afbddbc98accde27da668b88ce12790677bc6.tar drakx-cb3afbddbc98accde27da668b88ce12790677bc6.tar.gz drakx-cb3afbddbc98accde27da668b88ce12790677bc6.tar.bz2 drakx-cb3afbddbc98accde27da668b88ce12790677bc6.tar.xz drakx-cb3afbddbc98accde27da668b88ce12790677bc6.zip | |
reworked medium management.
Diffstat (limited to 'perl-install/install_steps_gtk.pm')
| -rw-r--r-- | perl-install/install_steps_gtk.pm | 6 |
1 files changed, 3 insertions, 3 deletions
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; |