diff options
author | Francois Pons <fpons@mandriva.com> | 2003-02-03 12:32:15 +0000 |
---|---|---|
committer | Francois Pons <fpons@mandriva.com> | 2003-02-03 12:32:15 +0000 |
commit | 19df65ab1d608cc643687067870f46d20736dd6c (patch) | |
tree | 55d3eb2b86b0658ada5fee34fc2cea533a721418 | |
parent | 403e5e792818761ace4f1183b22aa0cbad52455a (diff) | |
download | drakx-19df65ab1d608cc643687067870f46d20736dd6c.tar drakx-19df65ab1d608cc643687067870f46d20736dd6c.tar.gz drakx-19df65ab1d608cc643687067870f46d20736dd6c.tar.bz2 drakx-19df65ab1d608cc643687067870f46d20736dd6c.tar.xz drakx-19df65ab1d608cc643687067870f46d20736dd6c.zip |
integrated chmouel fixes.
-rw-r--r-- | perl-install/bootloader.pm | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index e57fd67dc..809d666b8 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -380,6 +380,12 @@ sub sanitize_ver { my $s = $1; $chtaim =~ m|^(\d+)\.(\d+)\.(\d+)\.(\d+)mdk|; $return = "$1$2$3-$4$s"; + } elsif ($chaloch =~ m|mdk| and $chtaim =~ /pre\d+/ + and $arba =~ m|(\d+)mdk(${mdksub})?|) { #new mdk with mdksub + my $r = $1; + my $s = $2 ? $2 : ""; + $chtaim =~ m|^(\d+)\.(\d+)\.(\d+)pre(\d+)|; + $return = "$1$2$3-p$4$r$s"; } elsif ($chtaim =~ m|mdk$|) { #new mdk $chtaim =~ m|^(\d+)\.(\d+)\.(\d+)\.(\d+)mdk$|; $return = "$1$2$3-$4"; |