summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-09-09 02:29:42 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-09-09 02:29:42 +0000
commit6e5b90a8eb9698bd7a41b975c66934e596144df9 (patch)
tree0695ee7c2e483a0c36dcf6105ce1d41798673bef /perl-install
parent71b7853242c9ec0faccd8cfea16209b46cbedeee (diff)
downloaddrakx-backup-do-not-use-6e5b90a8eb9698bd7a41b975c66934e596144df9.tar
drakx-backup-do-not-use-6e5b90a8eb9698bd7a41b975c66934e596144df9.tar.gz
drakx-backup-do-not-use-6e5b90a8eb9698bd7a41b975c66934e596144df9.tar.bz2
drakx-backup-do-not-use-6e5b90a8eb9698bd7a41b975c66934e596144df9.tar.xz
drakx-backup-do-not-use-6e5b90a8eb9698bd7a41b975c66934e596144df9.zip
fix regexp to work with "linux-2.6.8.1-10mdk"
Diffstat (limited to 'perl-install')
-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 346c3bcfa..6fa909824 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -615,7 +615,7 @@ sub sanitize_ver {
my ($string) = @_;
my ($name, $main_version, undef, $extraversion, $rest) =
- $string =~ m!(.*)(\d+\.\d+\.\d+)(-((?:pre|rc)\d+))?(.*)!;
+ $string =~ m!^(.*?-)(\d+(?:\.\d+)*)(-((?:pre|rc)\d+))?(.*)$!;
if (my ($mdkver, $cpu, $nproc, $mem) = $rest =~ m|-(.+)-(.+)-(.+)-(.+)|) {
$rest = "$cpu$nproc$mem-$mdkver";