diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2000-06-05 11:09:58 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2000-06-05 11:09:58 +0000 |
| commit | 739533335c9c0bc2703b2d8ec3b5cd9ea9cf0e1e (patch) | |
| tree | 4981224cb04379475df15254c36b43599573ee38 | |
| parent | a8713247655b192731b01795997f1b2155a4a5fa (diff) | |
| download | drakx-739533335c9c0bc2703b2d8ec3b5cd9ea9cf0e1e.tar drakx-739533335c9c0bc2703b2d8ec3b5cd9ea9cf0e1e.tar.gz drakx-739533335c9c0bc2703b2d8ec3b5cd9ea9cf0e1e.tar.bz2 drakx-739533335c9c0bc2703b2d8ec3b5cd9ea9cf0e1e.tar.xz drakx-739533335c9c0bc2703b2d8ec3b5cd9ea9cf0e1e.zip | |
*** empty log message ***
| -rw-r--r-- | perl-install/crypto.pm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/perl-install/crypto.pm b/perl-install/crypto.pm index a679597bc..7f96874ee 100644 --- a/perl-install/crypto.pm +++ b/perl-install/crypto.pm @@ -30,12 +30,13 @@ sub require2package { $deps{$_[0]} || $_[0] } sub mirror2text($) { $mirrors{$_[0]} && "$mirrors{$_[0]}[0] ($_[0])" } sub mirrorstext() { map { mirror2text($_) } keys %mirrors } sub text2mirror($) { first($_[0] =~ /\((.*)\)$/) } -sub ftp($) { ftp::new($_[0], "$mirrors{$_[0]}[1]/$::VERSION") } +sub dir { $mirrors{$_[0]}[1] . '/' . (arch() !~ /i386/ && arch() . '/') . $::VERSION } +sub ftp($) { ftp::new($_[0], dir($_[0])) } sub getFile($$) { my ($file, $host) = @_; - log::l("getting crypto file $file on directory $host:$mirrors{$host}[1]/$::VERSION with login $mirrors{$host}[2]"); - my ($ftp, $retr) = ftp::new($_[1], "$mirrors{$host}[1]/$::VERSION", + log::l("getting crypto file $file on directory " . dir($host) . " with login $mirrors{$host}[2]"); + my ($ftp, $retr) = ftp::new($host, dir($host), $mirrors{$host}[2] ? $mirrors{$host}[2] : (), $mirrors{$host}[3] ? $mirrors{$host}[3] : () ); |