aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS1
-rw-r--r--URPM/Resolve.pm4
2 files changed, 3 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 8e8e62f..7fb7529 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,6 @@
- fix slow matching of individual regexes for skipping dependencies by creating
a large regex to match them all at once (mdv#61389, Shlomi Fish)
+- support kernel 3.x in kmod resolution
Version 3.38.1 - 16 November 2010
diff --git a/URPM/Resolve.pm b/URPM/Resolve.pm
index 51fda20..ee65ff6 100644
--- a/URPM/Resolve.pm
+++ b/URPM/Resolve.pm
@@ -343,10 +343,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-/) {