From 5f0477547b3122c61cb11f97e5d2dfac8932fcce Mon Sep 17 00:00:00 2001
From: Rafael Garcia-Suarez <rgarciasuarez@mandriva.org>
Date: Fri, 3 Jun 2005 05:39:42 +0000
Subject: The mandrakelinux-release package doesn't exist any more, so you
 can't deduce the version from it. Something more robust than this needs to be
 figured out.

---
 perl-install/crypto.pm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'perl-install/crypto.pm')

diff --git a/perl-install/crypto.pm b/perl-install/crypto.pm
index 3e362fdf8..23b4dc93f 100644
--- a/perl-install/crypto.pm
+++ b/perl-install/crypto.pm
@@ -146,11 +146,13 @@ sub bestMirror {
     $possible[rand @possible];
 }
 
-#- hack to retrieve Mandrivaalinux version...
+#- hack to retrieve Mandriva Linux version... XXX figure out something more robust
 sub version() {
     require pkgs;
-    my $pkg = pkgs::packageByName($::o->{packages}, 'mandrakelinux-release');
-    $pkg && $pkg->version || '9.1'; #- safe but dangerous ;-)
+    my $pkg = pkgs::packageByName($::o->{packages}, 'mandriva-release');
+    my $v = $pkg && $pkg->version || '10.2'; #- safe but dangerous ;-)
+    $v eq '2006.0' and $v = '10.2';
+    $v;
 }
 
 sub dir { $mirrors{$_[0]}[1] }
-- 
cgit v1.2.1