diff options
| author | Thierry Vignaud <tv@mageia.org> | 2012-11-16 20:11:49 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2012-11-16 20:11:49 +0000 |
| commit | 5fef3fc1d701a4a63382dc47626663a7d0ccf6bb (patch) | |
| tree | f5f08fb29678f7f757eb5ad9b533236084d598b4 /urpm | |
| parent | 79a55e5e148548ffb7a4b79ec30a99f12e3badf6 (diff) | |
| download | urpmi-5fef3fc1d701a4a63382dc47626663a7d0ccf6bb.tar urpmi-5fef3fc1d701a4a63382dc47626663a7d0ccf6bb.tar.gz urpmi-5fef3fc1d701a4a63382dc47626663a7d0ccf6bb.tar.bz2 urpmi-5fef3fc1d701a4a63382dc47626663a7d0ccf6bb.tar.xz urpmi-5fef3fc1d701a4a63382dc47626663a7d0ccf6bb.zip | |
fix computing kernel orphans when running kernel is not the latest (1/2)
prevent trying to remove dkms packages for the latest (not currently
running) kernel
basically reverting commit r6236 from0 Oct 15 2012:
"(_kernel_callback) keep track of DKMS packages too"
Diffstat (limited to 'urpm')
| -rw-r--r-- | urpm/orphans.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/urpm/orphans.pm b/urpm/orphans.pm index a265f676..03f9e64e 100644 --- a/urpm/orphans.pm +++ b/urpm/orphans.pm @@ -354,7 +354,7 @@ sub _get_current_kernel_package() { # - returns list of kernels # # _fast_ version w/o looking at all non kernel packages requires on -# kernels (like "urpmi_find_leaves 'kernel'" would) +# kernels (like "urpmi_find_leaves '^kernel'" would) # # _all_unrequested_orphans blacklists nearly all kernels b/c of packages # like 'ndiswrapper' or 'basesystem' that requires 'kernel' @@ -371,8 +371,8 @@ sub _kernel_callback { # only consider kernels (and not main 'kernel' package): # but perform a pass on their requires for dkms like packages that require a specific kernel: - if ($shortname !~ /kernel-/) { - foreach (grep { /kernel/ } $pkg->requires_nosense) { + if ($shortname !~ /^kernel-/) { + foreach (grep { /^kernel/ } $pkg->requires_nosense) { $requested_kernels{$_}{$shortname} = $pkg; } return; |