diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-11-16 14:48:46 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-11-16 14:48:46 +0000 |
| commit | 84d5cde82dd249215f6a9073bd695b10cd81efa2 (patch) | |
| tree | 291841bb4eb7a8f246f49585f9fde831fbab2556 | |
| parent | 640716a7a64f1488b3db92b209a3e5dae992ed83 (diff) | |
| download | drakx-84d5cde82dd249215f6a9073bd695b10cd81efa2.tar drakx-84d5cde82dd249215f6a9073bd695b10cd81efa2.tar.gz drakx-84d5cde82dd249215f6a9073bd695b10cd81efa2.tar.bz2 drakx-84d5cde82dd249215f6a9073bd695b10cd81efa2.tar.xz drakx-84d5cde82dd249215f6a9073bd695b10cd81efa2.zip | |
enhance analyse_kernel_name(), esp. to handle i686-up-64GB
| -rw-r--r-- | perl-install/pkgs.pm | 7 |
1 files changed, 6 insertions, 1 deletions
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 { |