summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2004-10-05 11:22:53 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2004-10-05 11:22:53 +0000
commita689a6b2a9b7fa7dba0e840d9991193f8f1eec4e (patch)
tree87cd1b1f66c7f15cec789e2ca1aa30c0df359749
parentd3fe097e870dc1131b75bf1c9ca2f643b6098cb5 (diff)
downloaddrakx-a689a6b2a9b7fa7dba0e840d9991193f8f1eec4e.tar
drakx-a689a6b2a9b7fa7dba0e840d9991193f8f1eec4e.tar.gz
drakx-a689a6b2a9b7fa7dba0e840d9991193f8f1eec4e.tar.bz2
drakx-a689a6b2a9b7fa7dba0e840d9991193f8f1eec4e.tar.xz
drakx-a689a6b2a9b7fa7dba0e840d9991193f8f1eec4e.zip
Further normalization of updates directories.
-rw-r--r--perl-install/crypto.pm4
1 files changed, 1 insertions, 3 deletions
diff --git a/perl-install/crypto.pm b/perl-install/crypto.pm
index 880b94c90..8e39c22ff 100644
--- a/perl-install/crypto.pm
+++ b/perl-install/crypto.pm
@@ -67,7 +67,6 @@ sub mirrors {
my $qu = quotemeta $_;
$url =~ /\.$qu(?:\..*)?$/ and $land = $url2land{$_};
}
- $dir =~ s!/main$!!;
$mirrors{$url} = [ $land, $dir . $sub_dir ];
}
http::getFile('/XXX'); #- close connection.
@@ -147,8 +146,7 @@ sub getPackages {
#- extract hdlist of crypto, then depslist.
require pkgs;
- my $update_medium = pkgs::psUsingHdlist($prefix, 'ftp', $packages, "hdlist-updates.cz", "1u",
- $::o->{distro_type} =~ /cooker|community/ ? "main" : "",
+ my $update_medium = pkgs::psUsingHdlist($prefix, 'ftp', $packages, "hdlist-updates.cz", "1u", "",
"Updates for Mandrakelinux " . version(), 1, $fhdlist, $pubkey);
if ($update_medium) {
log::l("read updates hdlist");