diff options
| author | Olivier Blin <oblin@mandriva.com> | 2010-06-11 17:26:34 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.com> | 2010-06-11 17:26:34 +0000 |
| commit | 9f8506d6b533f5cbf0a87867003d192385541981 (patch) | |
| tree | 4ce2edcf9f343429c2185cd9374f41d398852d5c | |
| parent | 0c5c17666d1a8672a583ed55ecd7042a27080cbc (diff) | |
| download | drakx-9f8506d6b533f5cbf0a87867003d192385541981.tar drakx-9f8506d6b533f5cbf0a87867003d192385541981.tar.gz drakx-9f8506d6b533f5cbf0a87867003d192385541981.tar.bz2 drakx-9f8506d6b533f5cbf0a87867003d192385541981.tar.xz drakx-9f8506d6b533f5cbf0a87867003d192385541981.zip | |
compute new_media earlier (array keeps same elements when unselecting media)
| -rw-r--r-- | perl-install/install/media.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/install/media.pm b/perl-install/install/media.pm index c78675315..b15d745c0 100644 --- a/perl-install/install/media.pm +++ b/perl-install/install/media.pm @@ -669,6 +669,9 @@ sub get_media_cfg { urpm::media::add_distrib_media($packages, undef, $uri, ask_media => undef); #allmedia => 1 + my @new_media = difference2($packages->{media}, \@media); + _associate_phys_media($o->{all_hds}, $phys_medium, \@new_media); + select_only_some_media($packages->{media}, $selected_names) if defined $selected_names; if ($deselectionAllowed && !@{$packages->{media}}) { @@ -676,9 +679,6 @@ sub get_media_cfg { $o->ask_deselect_media__copy_on_disk($packages->{media}, $allow && \$o->{copy_rpms_on_disk}) if $allow || @{$packages->{media}} > 1; } - my @new_media = difference2($packages->{media}, \@media); - _associate_phys_media($o->{all_hds}, $phys_medium, \@new_media); - log::l("get_media_cfg read " . int(@{$packages->{depslist}}) . " headers"); _get_compsUsers_pl($phys_medium, $force_rpmsrate); |