From 7fa9e6019fd17e52f38295c86270f0f5be7484e2 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Tue, 3 Mar 2009 11:00:58 +0000 Subject: (get_media) workaround rel_path added by _stage2_mounted_medium() && _url2phys_medium() by using $o->{stage2_phys_medium}{url} when available --- perl-install/install/media.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'perl-install') diff --git a/perl-install/install/media.pm b/perl-install/install/media.pm index 43bf5aef0..50b22fcab 100644 --- a/perl-install/install/media.pm +++ b/perl-install/install/media.pm @@ -484,7 +484,8 @@ sub get_media { foreach (@$media) { if ($_->{type} eq 'media_cfg') { my $phys_m = url2mounted_phys_medium($o, $_->{url}, 'media_info'); - my $uri = $phys_m->{method} =~ m!^(ftp|http)://! && $phys_m->{method} + my $uri = $o->{stage2_phys_medium}{url} =~ m!^(http|ftp)://! && $o->{stage2_phys_medium}{url} || + $phys_m->{method} =~ m!^(ftp|http)://! && $phys_m->{method} || $phys_m->{real_mntpoint} || $phys_m->{url}; urpm::media::add_distrib_media($packages, undef, $uri, ask_media => undef); #allmedia => 1 _get_compsUsers_pl($phys_m, $_->{force_rpmsrate}); -- cgit v1.2.1