aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrédéric Buclin <LpSolit@netscape.net>2017-03-25 00:08:13 +0100
committerRémi Verschelde <rverschelde@gmail.com>2017-04-03 19:15:07 +0200
commit69b6ad5a9f8e3fc4c1e44d14857787e834386311 (patch)
tree590d20ac3bb041b7d439a39bb9c47475517754b2
parentee5d001cbd14742eae51c8033a879adc3fe86345 (diff)
downloadrpmdrake-69b6ad5a9f8e3fc4c1e44d14857787e834386311.tar
rpmdrake-69b6ad5a9f8e3fc4c1e44d14857787e834386311.tar.gz
rpmdrake-69b6ad5a9f8e3fc4c1e44d14857787e834386311.tar.bz2
rpmdrake-69b6ad5a9f8e3fc4c1e44d14857787e834386311.tar.xz
rpmdrake-69b6ad5a9f8e3fc4c1e44d14857787e834386311.zip
Do not mention orphans when (un)installing packages (mga#14594)
-rw-r--r--NEWS2
-rw-r--r--Rpmdrake/pkg.pm16
2 files changed, 2 insertions, 16 deletions
diff --git a/NEWS b/NEWS
index 1a733a5f..ec491988 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- do not mention orphans when (un)installing packages (mga#14594)
+
Version 6.24 - 11 March 2017, Rémi Verschelde
- add tooltips to arch & status columns (mga#7962)
diff --git a/Rpmdrake/pkg.pm b/Rpmdrake/pkg.pm
index 3560f721..bd65344c 100644
--- a/Rpmdrake/pkg.pm
+++ b/Rpmdrake/pkg.pm
@@ -903,14 +903,6 @@ you may now inspect some in order to take actions:"),
statusbar_msg_remove($statusbar_msg_id); #- XXX maybe remove this
- if ($exit_code == 0 && !$::rpmdrake_options{auto_orphans}) {
- if (urpm::orphans::check_unrequested_orphans_after_auto_select($urpm)) {
- if (my $msg = urpm::orphans::get_now_orphans_gui_msg($urpm)) {
- interactive_msg(N("Orphan packages"), $msg, scroll => 1);
- }
- }
- }
-
return_with_exit_code:
$something_installed = gurpm::RPMProgressDialog::get_something_done();
return !($something_installed || scalar(@to_remove));
@@ -929,9 +921,6 @@ sub perform_removal {
my $_gurpm_clean_guard = before_leaving { $gurpm->destroy };
$urpm->{nb_install} = @toremove;
- my $may_be_orphans = 1;
- urpm::orphans::unrequested_orphans_after_remove($urpm, \@toremove)
- or $may_be_orphans = 0;
my @results;
slow_func_statusbar(
@@ -954,11 +943,6 @@ sub perform_removal {
);
return 1;
} else {
- if ($may_be_orphans && !$::rpmdrake_options{auto_orphans}) {
- if (my $msg = urpm::orphans::get_now_orphans_gui_msg($urpm)) {
- interactive_msg(N("Information"), $msg, scroll => 1);
- }
- }
return 0;
}
}