diff options
| author | Olivier Blin <oblin@mandriva.com> | 2008-01-10 16:56:41 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.com> | 2008-01-10 16:56:41 +0000 |
| commit | 9336216a0dda9cda8f95b5c87a154e7063161ec9 (patch) | |
| tree | 913dcccc416950b18f0baa4b92f26808247e96a9 /URPM/Resolve.pm | |
| parent | 608d7c6156c3522a0a5484c062e86b5017a925b4 (diff) | |
| download | perl-URPM-9336216a0dda9cda8f95b5c87a154e7063161ec9.tar perl-URPM-9336216a0dda9cda8f95b5c87a154e7063161ec9.tar.gz perl-URPM-9336216a0dda9cda8f95b5c87a154e7063161ec9.tar.bz2 perl-URPM-9336216a0dda9cda8f95b5c87a154e7063161ec9.tar.xz perl-URPM-9336216a0dda9cda8f95b5c87a154e7063161ec9.zip | |
resolve kmod requires even if first choice is a source dkms (adapted from Pixel)
Diffstat (limited to 'URPM/Resolve.pm')
| -rw-r--r-- | URPM/Resolve.pm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/URPM/Resolve.pm b/URPM/Resolve.pm index b7c07cd..7af6b2b 100644 --- a/URPM/Resolve.pm +++ b/URPM/Resolve.pm @@ -266,12 +266,14 @@ sub _find_required_package__kernel_source { sub _find_required_package__kmod { my ($urpm, $db, $choices) = @_; - $choices->[0]->name =~ /-kernel-2\./ or return; + $choices->[0]->name =~ /^dkms-|-kernel-2\./ or return; my @l = grep { if (my ($name, $version, $flavor, $release) = $_->name =~ /(.*)-kernel-(2\..*)-(.*)-(.*)/) { my $kernel = "kernel-$flavor-$version-$release"; _is_selected_or_installed($urpm, $db, $kernel); + } elsif ($_->{name} =~ /^dkms-/) { + 0; # we prefer precompiled dkms } else { $urpm->{debug_URPM}("unknown kmod package " . $_->fullname) if $urpm->{debug_URPM}; 0; |