diff options
| author | Thierry Vignaud <tv@mandriva.org> | 2009-03-30 11:11:32 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mandriva.org> | 2009-03-30 11:11:32 +0000 |
| commit | 5ae5e37053b2dffcd91d99b6fe5951954f162e8f (patch) | |
| tree | ecbbcb2b69382146f23229425be5ad98d805e3d3 /perl-install/install/media.pm | |
| parent | 50e6c0f79824b395dc6f517cc2a9d3b2d5d1a71f (diff) | |
| download | drakx-backup-do-not-use-5ae5e37053b2dffcd91d99b6fe5951954f162e8f.tar drakx-backup-do-not-use-5ae5e37053b2dffcd91d99b6fe5951954f162e8f.tar.gz drakx-backup-do-not-use-5ae5e37053b2dffcd91d99b6fe5951954f162e8f.tar.bz2 drakx-backup-do-not-use-5ae5e37053b2dffcd91d99b6fe5951954f162e8f.tar.xz drakx-backup-do-not-use-5ae5e37053b2dffcd91d99b6fe5951954f162e8f.zip | |
(get_media) simplify after last commit (no more need to adjust path for arch)
Diffstat (limited to 'perl-install/install/media.pm')
| -rw-r--r-- | perl-install/install/media.pm | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/perl-install/install/media.pm b/perl-install/install/media.pm index bde8c98f0..afce601c9 100644 --- a/perl-install/install/media.pm +++ b/perl-install/install/media.pm @@ -505,16 +505,8 @@ sub get_media { my $uri = $o->{stage2_phys_medium}{url} =~ m!^(http|ftp)://! && $o->{stage2_phys_medium}{url} || $phys_m->{method} =~ m!^(ftp|http)://! && $phys_m->{method} || '/tmp/image'; - # adjust URI for cdroms if needed: - if (member($o->{stage2_phys_medium}{method}, qw(iso cdrom))) { - my $arch = arch(); - $uri .= "/" . ($arch =~ /i.86/ ? $MDK::Common::System::compat_arch{arch()} : arch()); - # FIXME: investigate why _get_compsUsers_pl($phys_m, $_->{force_rpmsrate}) didn't worked:o - system('cp', "$uri/media/media_info/rpmsrate", "/tmp/rpmsrate"); - system('cp', "$uri/media/media_info/compssUsers.pl", '/tmp/compssUsers.pl'); - } else { - _get_compsUsers_pl($phys_m, $_->{force_rpmsrate}); - } + _get_compsUsers_pl($phys_m, $_->{force_rpmsrate}); + urpm::media::add_distrib_media($packages, undef, $uri, ask_media => undef); #allmedia => 1 if (defined $_->{selected_names}) { |