summaryrefslogtreecommitdiffstats
path: root/urpm
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2016-11-11 21:15:11 +0000
committerThierry Vignaud <thierry.vignaud@gmail.com>2016-11-12 13:03:29 +0100
commitfe789c71982f311efa12e1cb50ad74e05a0662d7 (patch)
treeb0a3a4a4c827bfa6431c28f68076a467f34e819f /urpm
parent3596b17e8a289814da6ee22a53cb3a591ea34fab (diff)
downloadurpmi-fe789c71982f311efa12e1cb50ad74e05a0662d7.tar
urpmi-fe789c71982f311efa12e1cb50ad74e05a0662d7.tar.gz
urpmi-fe789c71982f311efa12e1cb50ad74e05a0662d7.tar.bz2
urpmi-fe789c71982f311efa12e1cb50ad74e05a0662d7.tar.xz
urpmi-fe789c71982f311efa12e1cb50ad74e05a0662d7.zip
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
Diffstat (limited to 'urpm')
-rw-r--r--urpm/orphans.pm2
1 files changed, 1 insertions, 1 deletions
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/;