diff options
| author | Thierry Vignaud <tv@mageia.org> | 2012-02-22 19:24:25 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2012-02-22 19:24:25 +0000 |
| commit | 93c4b32d370f87daf6af733b89652765408fa819 (patch) | |
| tree | 572e205ab1d40d2e68a6e7fcedebb93a6e074e9f | |
| parent | e512ae2d399dc67e05335e0543975d1d467fd299 (diff) | |
| download | perl-URPM-93c4b32d370f87daf6af733b89652765408fa819.tar perl-URPM-93c4b32d370f87daf6af733b89652765408fa819.tar.gz perl-URPM-93c4b32d370f87daf6af733b89652765408fa819.tar.bz2 perl-URPM-93c4b32d370f87daf6af733b89652765408fa819.tar.xz perl-URPM-93c4b32d370f87daf6af733b89652765408fa819.zip | |
support kernel 3.x in kmod resolution
(backported from trunk)
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | URPM/Resolve.pm | 4 |
2 files changed, 3 insertions, 2 deletions
@@ -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-/) { |