summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorent Villard <warly@mandriva.com>2004-10-18 16:38:33 +0000
committerFlorent Villard <warly@mandriva.com>2004-10-18 16:38:33 +0000
commit805effe05bbbffdcd5590cc28f1eba565ba1fc8e (patch)
tree70327536d33b4eda8b5489567a81da57c6b8866c
parentbf3f9c76e19c9727e81f6b759d9293f832473855 (diff)
downloaddrakx-805effe05bbbffdcd5590cc28f1eba565ba1fc8e.tar
drakx-805effe05bbbffdcd5590cc28f1eba565ba1fc8e.tar.gz
drakx-805effe05bbbffdcd5590cc28f1eba565ba1fc8e.tar.bz2
drakx-805effe05bbbffdcd5590cc28f1eba565ba1fc8e.tar.xz
drakx-805effe05bbbffdcd5590cc28f1eba565ba1fc8e.zip
update version checking code of crypto.pm
-rw-r--r--perl-install/crypto.pm7
1 files changed, 4 insertions, 3 deletions
diff --git a/perl-install/crypto.pm b/perl-install/crypto.pm
index cf8495856..830c908cd 100644
--- a/perl-install/crypto.pm
+++ b/perl-install/crypto.pm
@@ -112,11 +112,12 @@ sub bestMirror {
#- hack to retrieve Mandrakelinux version...
sub version() {
- require pkgs;
- my $pkg = pkgs::packageByName($::o->{packages}, 'mandrake-release');
- $pkg && $pkg->version || '9.1'; #- safe but dangerous ;-)
+ my $release = cat_("$::prefix/etc/mandrake-release");
+ my ($version) = $release =~ /Mandrake\s*linux.*\srelease\s+([\d.]+)/i;
+ $version || '10.0'; #- safe but dangerous ;-)
}
+
sub dir { $mirrors{$_[0]}[1] }
sub ftp($) { ftp::new($_[0], dir($_[0])) }