summaryrefslogtreecommitdiffstats
path: root/urpm
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2013-03-16 09:03:36 +0000
committerThierry Vignaud <tv@mageia.org>2013-03-16 09:03:36 +0000
commitb5cd309e4d79babfe9da2dbd083919580f7ac8c8 (patch)
treeaaab2c4a865dd6690e562c2cad9cfb3958673403 /urpm
parent751c3517d6f58718cf03ebca64041a7776413f8e (diff)
downloadurpmi-b5cd309e4d79babfe9da2dbd083919580f7ac8c8.tar
urpmi-b5cd309e4d79babfe9da2dbd083919580f7ac8c8.tar.gz
urpmi-b5cd309e4d79babfe9da2dbd083919580f7ac8c8.tar.bz2
urpmi-b5cd309e4d79babfe9da2dbd083919580f7ac8c8.tar.xz
urpmi-b5cd309e4d79babfe9da2dbd083919580f7ac8c8.zip
drop 'callback_report_uninst'
rationale: 'callback_uninst' now enables to get erasure progress
Diffstat (limited to 'urpm')
-rw-r--r--urpm/install.pm5
-rw-r--r--urpm/main_loop.pm3
2 files changed, 2 insertions, 6 deletions
diff --git a/urpm/install.pm b/urpm/install.pm
index 35f3383a..316acee2 100644
--- a/urpm/install.pm
+++ b/urpm/install.pm
@@ -281,7 +281,7 @@ sub _get_callbacks {
#- ensure perl does not create a circular reference below, otherwise all this won't be collected,
# and rpmdb won't be closed
- my ($verbose, $callback_report_uninst) = ($options->{verbose}, $options->{callback_report_uninst});
+ my $verbose = $options->{verbose};
$erase_logger = sub {
my ($urpm, undef, undef, $subtype) = @_;
@@ -293,7 +293,6 @@ sub _get_callbacks {
if (member($name, @previous)) {
$urpm->{log}("removing upgraded package $fullname");
} else {
- $callback_report_uninst and $callback_report_uninst->(N("Removing package %s", $fullname));
$urpm->{print}(N("removing package %s", $fullname)) if $verbose >= 0;
}
$index++;
@@ -320,7 +319,7 @@ Install packages according to each hash (remove, install or upgrade).
options:
test, excludepath, nodeps, noorder (unused), delta,
- callback_inst, callback_trans, callback_report_uninst, callback_uninst,
+ callback_inst, callback_trans, callback_uninst,
callback_open_helper, callback_close_helper,
post_clean_cache, verbose
(more options for trans->run)
diff --git a/urpm/main_loop.pm b/urpm/main_loop.pm
index 0eba7a27..a47f120f 100644
--- a/urpm/main_loop.pm
+++ b/urpm/main_loop.pm
@@ -222,7 +222,6 @@ sub _init_common_options {
callback_open_helper => $callbacks->{open_helper},
callback_trans => $callbacks->{trans},
callback_uninst => $callbacks->{uninst},
- callback_report_uninst => $callbacks->{callback_report_uninst},
raw_message => 1,
);
}
@@ -417,8 +416,6 @@ Parameters:
=item error() called for cpio, script or unpacking errors
-=item callback_report_uninst(): called for erasure progrses
-
=back
=item finish callbacks (mainly GUI callbacks for rpmdrake/gurpmi/drakx)