From 89a3bda63bc21a21715df3ce530ae85972ce96e6 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Tue, 28 Oct 2008 13:48:38 +0000 Subject: - urpmi o fix "urpmi firefox mozilla-firefox-ext-google-toolbar ; urpme --auto-orphans mozilla-firefox-ext-google-toolbar" which must not remove firefox (cf #45054) (this is especially bad for DrakX/rpmsrate) --- urpm/orphans.pm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'urpm/orphans.pm') diff --git a/urpm/orphans.pm b/urpm/orphans.pm index ceb9a3e0..42d8ea42 100644 --- a/urpm/orphans.pm +++ b/urpm/orphans.pm @@ -78,8 +78,9 @@ sub _selected_unrequested { require urpm::select; map { if (my $from = $selected->{$_}{from}) { - my $name = $urpm->{depslist}[$_]->name; - urpm::select::was_pkg_name_installed($rejected, $name) ? () : + my $pkg = $urpm->{depslist}[$_]; + my $name = $pkg->name; + $pkg->flag_requested || urpm::select::was_pkg_name_installed($rejected, $name) ? () : ($name => "(required by " . $from->fullname . ")"); } elsif ($selected->{$_}{suggested}) { ($urpm->{depslist}[$_]->name => "(suggested)"); -- cgit v1.2.1