From 374707eb2c9bf57e22fa2503b5c80663f0d24787 Mon Sep 17 00:00:00 2001 From: Olivier Blin Date: Wed, 24 Nov 2010 00:14:49 +0000 Subject: don't resolve hostname in http repository address, using IP address would break vhosts, and we copy resolv.conf in the chroot anyway --- lib/Iurt/Urpmi.pm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/Iurt/Urpmi.pm b/lib/Iurt/Urpmi.pm index 8a383a5..b28ffcc 100644 --- a/lib/Iurt/Urpmi.pm +++ b/lib/Iurt/Urpmi.pm @@ -24,15 +24,15 @@ sub new { if ($run->{use_system_distrib}) { $config->{basesystem_media_root} ||= $run->{use_system_distrib}; } elsif ($run->{chrooted_urpmi}) { - my ($host) = $run->{chrooted_urpmi}{rooted_media} =~ m,(?:file|http|ftp)://([^/]*),; - my ($_name, $_aliases, $_addrtype, $_length, @addrs) = gethostbyname($host); - - my $ip = join('.', unpack('C4', $addrs[0])); - - $ip =~ /\d+\.\d+\.\d+\.\d+/ - or die "FATAL: could not resolve $host ip address"; - - $run->{chrooted_urpmi}{rooted_media} =~ s/$host/$ip/; + #my ($host) = $run->{chrooted_urpmi}{rooted_media} =~ m,(?:file|http|ftp)://([^/]*),; + #my ($_name, $_aliases, $_addrtype, $_length, @addrs) = gethostbyname($host); + # + #my $ip = join('.', unpack('C4', $addrs[0])); + # + #$ip =~ /\d+\.\d+\.\d+\.\d+/ + # or die "FATAL: could not resolve $host ip address"; + # + #$run->{chrooted_urpmi}{rooted_media} =~ s/$host/$ip/; $run->{chrooted_media} = $run->{chrooted_urpmi}{rooted_media} . "/$run->{distro}/$run->{my_arch}"; -- cgit v1.2.1