diff options
| author | Florent Villard <warly@mandriva.com> | 2004-02-27 17:34:06 +0000 |
|---|---|---|
| committer | Florent Villard <warly@mandriva.com> | 2004-02-27 17:34:06 +0000 |
| commit | 924208331c9eea1071911a93fc96977e5f28d8d5 (patch) | |
| tree | 8c8c788166207eacd926fa4a965bfb9c740ad259 | |
| parent | c8385d88d194560c1df82e07c0a4a8ed56d86dcc (diff) | |
| download | drakx-924208331c9eea1071911a93fc96977e5f28d8d5.tar drakx-924208331c9eea1071911a93fc96977e5f28d8d5.tar.gz drakx-924208331c9eea1071911a93fc96977e5f28d8d5.tar.bz2 drakx-924208331c9eea1071911a93fc96977e5f28d8d5.tar.xz drakx-924208331c9eea1071911a93fc96977e5f28d8d5.zip | |
add distro_type variable to select correct updates mirror type
| -rw-r--r-- | perl-install/crypto.pm | 5 | ||||
| -rw-r--r-- | perl-install/install2.pm | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/perl-install/crypto.pm b/perl-install/crypto.pm index 30cc02c5a..b5b3a8ead 100644 --- a/perl-install/crypto.pm +++ b/perl-install/crypto.pm @@ -53,9 +53,10 @@ sub mirrors() { my $f = http::getFile("http://www.linux-mandrake.com/mirrorsfull.list"); local $SIG{ALRM} = sub { die "timeout" }; - alarm 60; + alarm 60; + my $type = $o->{distro_type} || 'updates'; foreach (<$f>) { - my ($arch, $url, $dir) = m|updates([^:]*):ftp://([^/]*)(/\S*)| or next; + my ($arch, $url, $dir) = m|$type([^:]*):ftp://([^/]*)(/\S*)| or next; MDK::Common::System::compat_arch($arch) or log::l("ignoring updates from $url because of incompatible arch: $arch"), next; my $land = N("United States"); diff --git a/perl-install/install2.pm b/perl-install/install2.pm index 900aab616..b99c0e0ad 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -570,6 +570,8 @@ sub main { $o->{meta_class} = 'download' if $VERSION =~ /download/i; $o->{meta_class} = 'firewall' if $VERSION =~ /firewall/i; $o->{meta_class} = 'server' if $VERSION =~ /server|prosuite/i; + $o->{distro_type} = 'community' if $VERSION =~ /community/i; + $o->{distro_type} = 'cooker' if $VERSION =~ /cooker/i; } $o->{meta_class} eq 'discovery' and $o->{meta_class} = 'desktop'; if ($::oem) { |