diff options
| author | Olivier Blin <oblin@mandriva.org> | 2004-09-02 02:58:06 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.org> | 2004-09-02 02:58:06 +0000 |
| commit | b06b2542f824a33d1d62d185eb41810a094225b5 (patch) | |
| tree | b711fccac2470e7ee4a14de0ab29385ef70f5b25 | |
| parent | c4cf793651840180ae7e892f7a5c304131d0e07a (diff) | |
| download | drakx-b06b2542f824a33d1d62d185eb41810a094225b5.tar drakx-b06b2542f824a33d1d62d185eb41810a094225b5.tar.gz drakx-b06b2542f824a33d1d62d185eb41810a094225b5.tar.bz2 drakx-b06b2542f824a33d1d62d185eb41810a094225b5.tar.xz drakx-b06b2542f824a33d1d62d185eb41810a094225b5.zip | |
adapt to new mirror structure
| -rw-r--r-- | perl-install/crypto.pm | 6 | ||||
| -rw-r--r-- | perl-install/install_any.pm | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/perl-install/crypto.pm b/perl-install/crypto.pm index ade67ad12..f4f7c67d0 100644 --- a/perl-install/crypto.pm +++ b/perl-install/crypto.pm @@ -67,7 +67,7 @@ sub mirrors { my $qu = quotemeta $_; $url =~ /\.$qu(?:\..*)?$/ and $land = $url2land{$_}; } - $dir =~ s!/RPMS$!!; + $dir =~ s!/main$!!; $mirrors{$url} = [ $land, $dir . $sub_dir ]; } http::getFile('/XXX'); #- close connection. @@ -134,7 +134,7 @@ sub getPackages { #- get pubkey file first as we cannot handle 2 files opened simultaneously. my $pubkey; eval { - my $fpubkey = getFile("../media_info/pubkey", $mirror); + my $fpubkey = getFile("media_info/pubkey", $mirror); $pubkey = [ $packages->parse_armored_file($fpubkey) ]; }; @@ -147,7 +147,7 @@ sub getPackages { #- extract hdlist of crypto, then depslist. require pkgs; - my $update_medium = pkgs::psUsingHdlist($prefix, 'ftp', $packages, "hdlist-updates.cz", "1u", "RPMS", + my $update_medium = pkgs::psUsingHdlist($prefix, 'ftp', $packages, "hdlist-updates.cz", "1u", "main", "Updates for Mandrakelinux " . version(), 1, $fhdlist, $pubkey); if ($update_medium) { log::l("read updates hdlist"); diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index b5d60d93c..508675b8e 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -841,9 +841,7 @@ sub install_urpmi { #- compute correctly reference to media/media_info my $with; if ($_->{update}) { - #- an update medium always use "../base/hdlist.cz"; - #- FIXME - $with = "../base/hdlist.cz"; + $with = "media_info/hdlist.cz"; } elsif ($_->{with_hdlist}) { $with = $_->{with_hdlist}; } else { |