From 0b065a954ffd4c09a1d9236f5c3c185ddcdc4151 Mon Sep 17 00:00:00 2001
From: Rafael Garcia-Suarez <rgarciasuarez@mandriva.org>
Date: Tue, 5 Oct 2004 10:57:51 +0000
Subject: New mirror structure for official updates

---
 perl-install/crypto.pm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/perl-install/crypto.pm b/perl-install/crypto.pm
index f4f7c67d0..880b94c90 100644
--- a/perl-install/crypto.pm
+++ b/perl-install/crypto.pm
@@ -57,7 +57,7 @@ sub mirrors {
 	local $SIG{ALRM} = sub { die "timeout" };
 	alarm 60;
 	my $distro_type = $o_distro_type || 'updates';
-	my $sub_dir = $distro_type =~ /cooker|community/ ? '' : '/' . version();
+	my $sub_dir = $distro_type =~ /cooker|community/ ? '' : '/' . version() . '/main_updates';
 	foreach (<$f>) {
 	    my ($arch, $url, $dir) = m|$distro_type([^:]*):ftp://([^/]*)(/\S*)| or next;
 	    MDK::Common::System::compat_arch($arch) or
@@ -147,7 +147,8 @@ sub getPackages {
     
     #- extract hdlist of crypto, then depslist.
     require pkgs;
-    my $update_medium = pkgs::psUsingHdlist($prefix, 'ftp', $packages, "hdlist-updates.cz", "1u", "main",
+    my $update_medium = pkgs::psUsingHdlist($prefix, 'ftp', $packages, "hdlist-updates.cz", "1u",
+					    $::o->{distro_type} =~ /cooker|community/ ? "main" : "",
 					    "Updates for Mandrakelinux " . version(), 1, $fhdlist, $pubkey);
     if ($update_medium) {
 	log::l("read updates hdlist");
-- 
cgit v1.2.1