From fe789c71982f311efa12e1cb50ad74e05a0662d7 Mon Sep 17 00:00:00 2001 From: Martin Whitaker Date: Fri, 11 Nov 2016 21:15:11 +0000 Subject: skip kernel-firmware-nonfree too ...when considering real kernels Thus preventing kernel-firmware-nonfree being falsely detected as an orphan package (mga#12361). It should be handled by generic orphan mechanism --- NEWS | 4 ++++ urpm/orphans.pm | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index c24e6351..51aff40e 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,7 @@ +- skip kernel-firmware-nonfree too when considering real kernels + Thus preventing kernel-firmware-nonfree being falsely detected as an orphan + package (mga#12361) + Version 8.105 - 20 October 2016 - adapt testsuite to rpm-4.13.0~rc2 diff --git a/urpm/orphans.pm b/urpm/orphans.pm index 8ed2d3eb..6d427412 100644 --- a/urpm/orphans.pm +++ b/urpm/orphans.pm @@ -454,7 +454,7 @@ sub _kernel_callback { } # only consider real kernels (and not kernel-doc and the like): - return if $shortname =~ /-(?:source|doc|headers|firmware(?:|-extra))$/; + return if $shortname =~ /-(?:source|doc|headers|firmware(?:|-extra|-nonfree))$/; # ignore requested kernels (aka that are not in /var/lib/rpm/installed-through-deps.list) return if !$unreq_list->{$shortname} && $shortname !~ /latest/; -- cgit v1.2.1