summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-08-11 13:16:42 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-08-11 13:16:42 +0000
commit96179a62f26819b22496e01753b7a3e17d723c20 (patch)
treead1d4e9131608e4ea818538bfc1df93438e4dff3
parent60c5be6245a02d6f09aebd2d257716a578bc90c3 (diff)
downloaddrakx-backup-do-not-use-96179a62f26819b22496e01753b7a3e17d723c20.tar
drakx-backup-do-not-use-96179a62f26819b22496e01753b7a3e17d723c20.tar.gz
drakx-backup-do-not-use-96179a62f26819b22496e01753b7a3e17d723c20.tar.bz2
drakx-backup-do-not-use-96179a62f26819b22496e01753b7a3e17d723c20.tar.xz
drakx-backup-do-not-use-96179a62f26819b22496e01753b7a3e17d723c20.zip
sanitize_ver() can fail and return ''
-rw-r--r--perl-install/bootloader.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index b185a5263..9902a382a 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -276,7 +276,7 @@ sub add_kernel {
symlinkf("initrd-$version.img", "$::prefix$initrd") or cp_af("$::prefix/boot/initrd-$version.img", "$::prefix$initrd");
}
- my $label = $ext =~ /-(default)/ ? $1 : ($ext =~ /\d\./ ? sanitize_ver("linux-$version") : "linux$ext");
+ my $label = $ext =~ /-(default)/ ? $1 : ($ext =~ /\d\./ && sanitize_ver("linux-$version") || "linux$ext");
#- more yaboot concessions - PPC
if (arch() =~ /ppc/) {