From 84d5cde82dd249215f6a9073bd695b10cd81efa2 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Tue, 16 Nov 2004 14:48:46 +0000
Subject: enhance analyse_kernel_name(), esp. to handle i686-up-64GB

---
 perl-install/pkgs.pm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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

diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index 2889fbee7..af8070597 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -175,7 +175,12 @@ sub packageById {
 }
 
 sub analyse_kernel_name {
-    $_[0] =~ /kernel[^\-]*(-enterprise|-i686-up-4GB|-i586-up-1GB|-p3-smp-64GB|-secure|-smp|-multimedia|-multimedia-smp)?(?:-([^\-]+))?$/;
+    my $kernels = join('|', map { "-$_" }
+	'(p3|i586|i686)-(up|smp)-(1GB|4GB|64GB)', 
+	qw(enterprise secure smp multimedia multimedia-smp),
+    );
+    my @l = $_[0] =~ /kernel[^\-]*($kernels)?(-([^\-]+))?$/ or return;
+    $l[0], $l[-1];
 }
 
 sub packages2kernels {
-- 
cgit v1.2.1