diff options
| author | Olivier Blin <blino@mageia.org> | 2012-01-15 03:13:33 +0000 |
|---|---|---|
| committer | Olivier Blin <blino@mageia.org> | 2012-01-15 03:13:33 +0000 |
| commit | 1e90ec2852b9d0370efb7a9af8d215900848a038 (patch) | |
| tree | 68d36aea8ce882d64fdc53f6a0cf933d78b75940 | |
| parent | 088d8dc75626570e71924c7cf6c32cb0bd948d59 (diff) | |
| download | perl-URPM-1e90ec2852b9d0370efb7a9af8d215900848a038.tar perl-URPM-1e90ec2852b9d0370efb7a9af8d215900848a038.tar.gz perl-URPM-1e90ec2852b9d0370efb7a9af8d215900848a038.tar.bz2 perl-URPM-1e90ec2852b9d0370efb7a9af8d215900848a038.tar.xz perl-URPM-1e90ec2852b9d0370efb7a9af8d215900848a038.zip | |
support kernel 3.x in kmod resolution
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | URPM/Resolve.pm | 4 |
2 files changed, 4 insertions, 2 deletions
@@ -1,3 +1,5 @@ +- support kernel 3.x in kmod resolution + Version 3.38.5 - 19 December 2011 - fix parsing a spec file with rpm-4.9 diff --git a/URPM/Resolve.pm b/URPM/Resolve.pm index ea18a7f..a284f3a 100644 --- a/URPM/Resolve.pm +++ b/URPM/Resolve.pm @@ -345,10 +345,10 @@ sub _find_required_package__kernel_source { sub _find_required_package__kmod { my ($urpm, $db, $choices) = @_; - $choices->[0]->name =~ /^dkms-|-kernel-2\./ or return; + $choices->[0]->name =~ /^dkms-|-kernel-\d\./ or return; grep { - if (my ($_name, $version, $flavor, $release) = $_->name =~ /(.*)-kernel-(2\..*)-(.*)-(.*)/) { + if (my ($_name, $version, $flavor, $release) = $_->name =~ /(.*)-kernel-(\d\..*)-(.*)-(.*)/) { my $kernel = "kernel-$flavor-$version-$release"; _is_selected_or_installed($urpm, $db, $kernel); } elsif ($_->name =~ /^dkms-/) { |