From a901c2938331de7108a9edc434078d1b5d7e30a4 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Mon, 12 May 2014 19:04:32 +0200 Subject: kill support for kernel-*source-stripped We don't have those since 2004 (10 years+)... --- NEWS | 1 + URPM/Resolve.pm | 9 ++------- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/NEWS b/NEWS index 2e86491..8662f51 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,5 @@ - enhanced doc +- kill support for kernel-*source-stripped Version 4.30 - 1 May 2014 diff --git a/URPM/Resolve.pm b/URPM/Resolve.pm index f1adde5..95b55ec 100644 --- a/URPM/Resolve.pm +++ b/URPM/Resolve.pm @@ -406,16 +406,11 @@ sub _find_required_package__kernel_source { $choices->[0]->name =~ /^kernel-(.*source-|.*-devel-)/ or return; grep { - if ($_->name =~ /^kernel-.*source-stripped-(.*)/) { - my $version = quotemeta($1); - find { - $_->name =~ /-$version$/ && ($_->flag_installed || $_->flag_selected); - } $urpm->packages_providing('kernel'); - } elsif ($_->name =~ /(kernel-.*)-devel-(.*)/) { + if ($_->name =~ /(kernel-.*)-devel-(.*)/) { my $kernel = "$1-$2"; _is_selected_or_installed($urpm, $db, $kernel); } elsif ($_->name =~ /^kernel-.*source-/) { - #- hopefully we don't have a media with kernel-source but not kernel-source-stripped nor kernel-.*-devel + #- hopefully we don't have a media with kernel-source but not kernel-.*-devel 0; } else { $urpm->{debug_URPM}("unknown kernel-source package " . $_->fullname) if $urpm->{debug_URPM}; -- cgit v1.2.1