summaryrefslogtreecommitdiffstats
path: root/urpm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-10-28 13:52:22 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-10-28 13:52:22 +0000
commit50c294bd92c9f88efb2d3e9dca402d88e9661a86 (patch)
treeb814bb9375e4d67d27e891c3a36601b6de6d3958 /urpm
parentd54d9d62a050ea9adfccfa1a294fe8e3c671f8f5 (diff)
downloadurpmi-50c294bd92c9f88efb2d3e9dca402d88e9661a86.tar
urpmi-50c294bd92c9f88efb2d3e9dca402d88e9661a86.tar.gz
urpmi-50c294bd92c9f88efb2d3e9dca402d88e9661a86.tar.bz2
urpmi-50c294bd92c9f88efb2d3e9dca402d88e9661a86.tar.xz
urpmi-50c294bd92c9f88efb2d3e9dca402d88e9661a86.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.pm5
1 files changed, 3 insertions, 2 deletions
diff --git a/urpm/orphans.pm b/urpm/orphans.pm
index 57cda207..b298eb89 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)");