aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2014-05-12 19:04:32 +0200
committerThierry Vignaud <thierry.vignaud@gmail.com>2014-05-12 19:04:32 +0200
commita901c2938331de7108a9edc434078d1b5d7e30a4 (patch)
tree3351722b7b7afad05aa2ca6029dd9854d6bbbe2c
parent24658b4d6a62c78a2b009c8903027d1198ad3508 (diff)
downloadperl-URPM-a901c2938331de7108a9edc434078d1b5d7e30a4.tar
perl-URPM-a901c2938331de7108a9edc434078d1b5d7e30a4.tar.gz
perl-URPM-a901c2938331de7108a9edc434078d1b5d7e30a4.tar.bz2
perl-URPM-a901c2938331de7108a9edc434078d1b5d7e30a4.tar.xz
perl-URPM-a901c2938331de7108a9edc434078d1b5d7e30a4.zip
kill support for kernel-*source-stripped
We don't have those since 2004 (10 years+)...
-rw-r--r--NEWS1
-rw-r--r--URPM/Resolve.pm9
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};