summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2010-06-11 17:25:43 +0000
committerOlivier Blin <oblin@mandriva.com>2010-06-11 17:25:43 +0000
commit0c5c17666d1a8672a583ed55ecd7042a27080cbc (patch)
tree8046bd04cea064ae58791c9e9ed06a1e53e44b5a
parent21793e7bc5d1e270aaf2fa3c0f878f0373f31ff1 (diff)
downloaddrakx-backup-do-not-use-0c5c17666d1a8672a583ed55ecd7042a27080cbc.tar
drakx-backup-do-not-use-0c5c17666d1a8672a583ed55ecd7042a27080cbc.tar.gz
drakx-backup-do-not-use-0c5c17666d1a8672a583ed55ecd7042a27080cbc.tar.bz2
drakx-backup-do-not-use-0c5c17666d1a8672a583ed55ecd7042a27080cbc.tar.xz
drakx-backup-do-not-use-0c5c17666d1a8672a583ed55ecd7042a27080cbc.zip
pass media list to select_only_some_media
-rw-r--r--perl-install/install/media.pm6
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/install/media.pm b/perl-install/install/media.pm
index 93761008a..c78675315 100644
--- a/perl-install/install/media.pm
+++ b/perl-install/install/media.pm
@@ -475,9 +475,9 @@ sub _parse_media_cfg {
}
sub select_only_some_media {
- my ($packages, $selected_names) = @_;
+ my ($media_list, $selected_names) = @_;
my @names = split(',', $selected_names);
- foreach my $m (@{$packages->{media}}) {
+ foreach my $m (@{$media_list}) {
my $bool = !member($m->{name}, @names);
# workaround urpmi transforming "ignore => ''" or "ignore => 0" into "ignore => 1":
undef $bool if !$bool;
@@ -669,7 +669,7 @@ sub get_media_cfg {
urpm::media::add_distrib_media($packages, undef, $uri, ask_media => undef); #allmedia => 1
- select_only_some_media($packages, $selected_names) if defined $selected_names;
+ select_only_some_media($packages->{media}, $selected_names) if defined $selected_names;
if ($deselectionAllowed && !@{$packages->{media}}) {
my $allow = _allow_copy_rpms_on_disk($phys_medium, $packages->{media});