be careful when an obsoleted package is listed in potential orphans

When package B obsoletes package A and package A is listed as a
potential orphan (ie it appears in installed-through-deps.list), then
B is marked as a potential orphan too (since "obsoletes" more or less
means that A was renamed to B). However, if B was originally installed
and does not appear in installed-through-deps, that means it's not a
potential orphan and thus it shouldn't be added to the potential orphans
list. Fixes #54590.

1 files changed, 4 insertions, 2 deletions

diff --git a/urpm/orphans.pm b/urpm/orphans.pm
index b53392e8..9b41bd5e 100644
--- a/urpm/orphans.pm
+++ b/urpm/orphans.pm
@@ -130,7 +130,7 @@ sub _selected_unrequested {
 #- 
 #- side-effects: none
 sub _renamed_unrequested {
-    my ($urpm, $rejected) = @_;
+    my ($urpm, $selected, $rejected) = @_;
     
     my @obsoleted = grep { $rejected->{$_}{obsoleted} } keys %$rejected or return;
 
@@ -144,6 +144,8 @@ sub _renamed_unrequested {
 
 	my ($new_fn) = keys %{$rejected->{$fn}{closure}};
 	my ($new_n) = $new_fn =~ $fullname2name_re;
+
+	grep { my $pkg = $urpm->{depslist}[$_]; ($pkg->name eq $new_n) && $pkg->flag_installed && $pkg->flag_upgrade } keys %$selected and next;
 	if ($new_n ne $n) {
 	    $l{$new_n} = "(obsoletes $fn)";
 	}
@@ -154,7 +156,7 @@ sub new_unrequested {
     my ($urpm, $state) = @_;
     (
 	_selected_unrequested($urpm, $state->{selected}, $state->{rejected}),
-	_renamed_unrequested($urpm, $state->{rejected}),
+	_renamed_unrequested($urpm, $state->{selected}, $state->{rejected}),
     );
 }
 #- side-effects: <root>/var/lib/rpm/installed-through-deps.list