[Mageia-sysadm] [130] don't resolve hostname in http repository address, using IP address

root at mageia.org root at mageia.org
Wed Nov 24 01:14:49 CET 2010


Revision: 130
Author:   blino
Date:     2010-11-24 01:14:49 +0100 (Wed, 24 Nov 2010)
Log Message:
-----------
don't resolve hostname in http repository address, using IP address
would break vhosts, and we copy resolv.conf in the chroot anyway

Modified Paths:
--------------
    build_system/iurt/trunk/lib/Iurt/Urpmi.pm

Modified: build_system/iurt/trunk/lib/Iurt/Urpmi.pm
===================================================================
--- build_system/iurt/trunk/lib/Iurt/Urpmi.pm	2010-11-24 00:00:49 UTC (rev 129)
+++ build_system/iurt/trunk/lib/Iurt/Urpmi.pm	2010-11-24 00:14:49 UTC (rev 130)
@@ -24,15 +24,15 @@
     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}";
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/mageia-sysadm/attachments/20101124/d7cab82a/attachment.html>


More information about the Mageia-sysadm mailing list