summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2009-04-06 18:00:46 +0000
committerThierry Vignaud <tv@mandriva.org>2009-04-06 18:00:46 +0000
commit1e000f9b2e32c3f2490eeea0efa4a600a00a4cbf (patch)
treecc8dde8299830cdfb80dbe35e7e16ab4292ce172
parented09a7b52b7b7e341be4569000fb3cf5e8c90690 (diff)
downloaddrakx-1e000f9b2e32c3f2490eeea0efa4a600a00a4cbf.tar
drakx-1e000f9b2e32c3f2490eeea0efa4a600a00a4cbf.tar.gz
drakx-1e000f9b2e32c3f2490eeea0efa4a600a00a4cbf.tar.bz2
drakx-1e000f9b2e32c3f2490eeea0efa4a600a00a4cbf.tar.xz
drakx-1e000f9b2e32c3f2490eeea0efa4a600a00a4cbf.zip
(get_media_cfg) only associate current physical medium to newly added media
-rw-r--r--perl-install/install/media.pm5
1 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/install/media.pm b/perl-install/install/media.pm
index 2b9719357..2aaa77e51 100644
--- a/perl-install/install/media.pm
+++ b/perl-install/install/media.pm
@@ -641,6 +641,8 @@ sub _get_media_url {
sub get_media_cfg {
my ($o, $phys_medium, $packages, $selected_names, $force_rpmsrate) = @_;
+ my @media = @{$packages->{media}};
+
my ($distribconf);
if (getAndSaveFile_($phys_medium, 'media_info/media.cfg', '/tmp/media.cfg')) {
($distribconf) = _parse_media_cfg('/tmp/media.cfg');
@@ -667,7 +669,8 @@ sub get_media_cfg {
$o->ask_deselect_media__copy_on_disk($packages->{media}, $allow && \$o->{copy_rpms_on_disk}) if $allow || @{$packages->{media}} > 1;
}
- _associate_phys_media($o->{all_hds}, $phys_medium, $packages->{media});
+ 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");