From 01cc16b6174ef4b9ddc74725304478efeb708b52 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Fri, 9 Nov 2007 09:56:34 +0000
Subject: create _sanitize_ver() for future changes in kernel_str2label()

---
 perl-install/bootloader.pm | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

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

diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 478a20a94..605712975 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -86,7 +86,7 @@ sub kernel_str2label {
     my ($kernel, $o_use_long_name) = @_;
     my $base = $kernel->{basename} eq 'vmlinuz' ? 'linux' : $kernel->{basename};
     $o_use_long_name || $kernel->{use_long_name} ?
-      sanitize_ver($base, $kernel) : $base;
+      _sanitize_ver($kernel) : $base;
 }
 
 sub get {
@@ -851,10 +851,18 @@ sub short_ext {
 
     $short_ext || $kernel_str->{ext};
 }
-sub sanitize_ver {
-    my ($name, $kernel_str) = @_;
 
-    $name = '' if $name eq 'linux';
+# deprecated, only for compatibility (nov 2007)
+sub sanitize_ver {    
+    my ($_name, $kernel_str) = @_;
+    _sanitize_ver($kernel_str);
+}
+
+sub _sanitize_ver {
+    my ($kernel_str) = @_;
+
+    my $name = $kernel_str->{basename};
+    $name = '' if $name eq 'vmlinuz';
 
     my $v = $kernel_str->{version_no_ext};
     if ($v =~ s/-\d+\.mm\././) {
-- 
cgit v1.2.1