diff options
| author | Francois Pons <fpons@mandriva.com> | 2002-01-04 16:41:45 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2002-01-04 16:41:45 +0000 |
| commit | aa560937696c59232dfdf00f3b493b8f85bf412a (patch) | |
| tree | fb69a3a5fba8ad2d14714da1ac99265485dd8151 /perl-install/install_steps_gtk.pm | |
| parent | 254cfcd2acdd915bd37e73d36868f26d5b7587fa (diff) | |
| download | drakx-backup-do-not-use-aa560937696c59232dfdf00f3b493b8f85bf412a.tar drakx-backup-do-not-use-aa560937696c59232dfdf00f3b493b8f85bf412a.tar.gz drakx-backup-do-not-use-aa560937696c59232dfdf00f3b493b8f85bf412a.tar.bz2 drakx-backup-do-not-use-aa560937696c59232dfdf00f3b493b8f85bf412a.tar.xz drakx-backup-do-not-use-aa560937696c59232dfdf00f3b493b8f85bf412a.zip | |
added update installation support to install (big modifs need testing).
Diffstat (limited to 'perl-install/install_steps_gtk.pm')
| -rw-r--r-- | perl-install/install_steps_gtk.pm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm index 5350faf2f..b13a1467d 100644 --- a/perl-install/install_steps_gtk.pm +++ b/perl-install/install_steps_gtk.pm @@ -335,7 +335,7 @@ sub reallyChooseGroups { sub choosePackagesTree { - my ($o, $packages) = @_; + my ($o, $packages, $limit_to_medium) = @_; my $available = install_any::getAvailableSpace($o); my $availableCorrected = pkgs::invCorrectSize($available / sqr(1024)) * sqr(1024); @@ -356,6 +356,7 @@ sub choosePackagesTree { my ($add_node, $flat) = @_; if ($flat) { foreach (sort keys %{$packages->{names}}) { + !$limit_to_medium || pkgs::packageMedium($packages, $_) == $limit_to_medium or next; $add_node->($_, undef); } } else { @@ -364,6 +365,7 @@ sub choosePackagesTree { #$fl{$_} = $o->{compssUsersChoice}{$_} foreach @{$o->{compssUsers}{$root}{flags}}; #- FEATURE:improve choce of packages... $fl{$_} = 1 foreach @{$o->{compssUsers}{$root}{flags}}; foreach my $p (values %{$packages->{names}}) { + !$limit_to_medium || pkgs::packageMedium($packages, $p) == $limit_to_medium or next; my ($rate, @flags) = pkgs::packageRateRFlags($p); next if !($rate && grep { grep { !/^!/ && $fl{$_} } split('\|\|') } @flags); $rate >= 3 ? @@ -378,7 +380,7 @@ sub choosePackagesTree { }, get_info => sub { my $p = pkgs::packageByName($packages, $_[0]) or return ''; - pkgs::extractHeaders($o->{prefix}, [$p], pkgs::packageMedium($packages, $p)); + pkgs::extractHeaders($o->{prefix}, [$p], $packages->{mediums}); pkgs::packageHeader($p) or die; my $imp = translate($pkgs::compssListDesc{pkgs::packageFlagBase($p) ? |