diff options
author | Thierry Vignaud <tv@mandriva.org> | 2009-03-02 13:59:19 +0000 |
---|---|---|
committer | Thierry Vignaud <tv@mandriva.org> | 2009-03-02 13:59:19 +0000 |
commit | 917b6de90beddeecf819a4a8ba75e5b91e9ddfe9 (patch) | |
tree | 0f095362ab029d6bcb10a46b1eac9643af1bf00f /perl-install/install/pkgs.pm | |
parent | fc2ab17ea71913f7cda6fa11da9a0c476ecb9610 (diff) | |
download | drakx-917b6de90beddeecf819a4a8ba75e5b91e9ddfe9.tar drakx-917b6de90beddeecf819a4a8ba75e5b91e9ddfe9.tar.gz drakx-917b6de90beddeecf819a4a8ba75e5b91e9ddfe9.tar.bz2 drakx-917b6de90beddeecf819a4a8ba75e5b91e9ddfe9.tar.xz drakx-917b6de90beddeecf819a4a8ba75e5b91e9ddfe9.zip |
use urpmi code in order to add media (and replace medium->{selected}
by medium->{ignore} for compatibility with urpmi)
Diffstat (limited to 'perl-install/install/pkgs.pm')
-rw-r--r-- | perl-install/install/pkgs.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/install/pkgs.pm b/perl-install/install/pkgs.pm index fd33aab1f..af4f8d6c5 100644 --- a/perl-install/install/pkgs.pm +++ b/perl-install/install/pkgs.pm @@ -125,7 +125,7 @@ sub packagesToInstall { my ($packages) = @_; my @packages; foreach (@{$packages->{media}}) { - $_->{selected} or next; + !$_->{ignore} or next; log::l("examining packagesToInstall of medium $_->{name}"); push @packages, grep { $_->flag_selected } install::media::packagesOfMedium($packages, $_); } @@ -142,7 +142,7 @@ sub _packageRequest { #- check for medium selection, if the medium has not been #- selected, the package cannot be selected. - packageMedium($packages, $pkg)->{selected} or return; + !packageMedium($packages, $pkg)->{ignore} or return; +{ $pkg->id => 1 }; } @@ -633,7 +633,7 @@ sub selectPackagesToUpgrade { sub _filter_packages { my ($retry, $packages, @packages) = @_; grep { - if ($_->flag_installed || !packageMedium($packages, $_)->{selected}) { + if ($_->flag_installed || packageMedium($packages, $_)->{ignore}) { if ($_->name eq 'mdv-rpm-summary' && $_->flag_installed) { install::pkgs::setup_rpm_summary_translations(); } |