diff options
author | Pascal Rigaux <pixel@mandriva.com> | 2007-08-12 12:54:39 +0000 |
---|---|---|
committer | Pascal Rigaux <pixel@mandriva.com> | 2007-08-12 12:54:39 +0000 |
commit | d31b1423e7d02392b02ed5336a4ab60fb6c1f236 (patch) | |
tree | b114d3e6b73cffa8078aabfe7d7c11b89afb8067 /perl-install/install/pkgs.pm | |
parent | 1a0ee0c3e70c87e80f7895e7e3a92a8e4daeb7e4 (diff) | |
download | drakx-d31b1423e7d02392b02ed5336a4ab60fb6c1f236.tar drakx-d31b1423e7d02392b02ed5336a4ab60fb6c1f236.tar.gz drakx-d31b1423e7d02392b02ed5336a4ab60fb6c1f236.tar.bz2 drakx-d31b1423e7d02392b02ed5336a4ab60fb6c1f236.tar.xz drakx-d31b1423e7d02392b02ed5336a4ab60fb6c1f236.zip |
rename {mediums} field into {media} to be compatible with urpm:: modules (from urpmi)
Diffstat (limited to 'perl-install/install/pkgs.pm')
-rw-r--r-- | perl-install/install/pkgs.pm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/perl-install/install/pkgs.pm b/perl-install/install/pkgs.pm index a5452c3d5..4cc86e1af 100644 --- a/perl-install/install/pkgs.pm +++ b/perl-install/install/pkgs.pm @@ -160,7 +160,7 @@ sub bestKernelPackage { sub packagesToInstall { my ($packages) = @_; my @packages; - foreach (@{$packages->{mediums}}) { + foreach (@{$packages->{media}}) { $_->{selected} or next; log::l("examining packagesToInstall of medium $_->{name}"); push @packages, grep { $_->flag_selected } install::media::packagesOfMedium($packages, $_); @@ -322,7 +322,7 @@ sub empty_packages() { my $packages = new URPM; #- add additional fields used by DrakX. - @$packages{qw(count mediums)} = (0, []); + @$packages{qw(count media)} = (0, []); $packages; } @@ -659,7 +659,7 @@ sub selectPackagesToUpgrade { sub installTransactionClosure { my ($packages, $id2pkg, $isUpgrade) = @_; - foreach (grep { !$_->{selected} } @{$packages->{mediums}}) { + foreach (grep { !$_->{selected} } @{$packages->{media}}) { foreach ($_->{start} .. $_->{end}) { delete $id2pkg->{$_}; } @@ -669,7 +669,7 @@ sub installTransactionClosure { my $medium; #- search first usable medium (media are sorted). - foreach (@{$packages->{mediums}}) { + foreach (@{$packages->{media}}) { if ($l[0] <= $_->{end}) { #- we have a candidate medium, it could be the right one containing #- the first package of @l... @@ -779,7 +779,7 @@ sub install { } #- extract headers for parent as they are used by callback. - extractHeaders(\@transToInstall, $packages->{mediums}); + extractHeaders(\@transToInstall, $packages->{media}); my ($retry, $retry_count); while (@transToInstall) { |