diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2008-10-28 13:48:38 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2008-10-28 13:48:38 +0000 |
| commit | 89a3bda63bc21a21715df3ce530ae85972ce96e6 (patch) | |
| tree | 08a4a88f870ee148c3e6f9fcc99233b895f9d247 /urpm | |
| parent | bb0fabd2c2bffcf3def2c8c538921305d09ec298 (diff) | |
| download | urpmi-89a3bda63bc21a21715df3ce530ae85972ce96e6.tar urpmi-89a3bda63bc21a21715df3ce530ae85972ce96e6.tar.gz urpmi-89a3bda63bc21a21715df3ce530ae85972ce96e6.tar.bz2 urpmi-89a3bda63bc21a21715df3ce530ae85972ce96e6.tar.xz urpmi-89a3bda63bc21a21715df3ce530ae85972ce96e6.zip | |
- 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)
Diffstat (limited to 'urpm')
| -rw-r--r-- | urpm/orphans.pm | 5 |
1 files changed, 3 insertions, 2 deletions
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)"); |