diff options
| author | Thierry Vignaud <tv@mageia.org> | 2013-02-25 17:57:16 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2013-02-25 17:57:16 +0000 |
| commit | 19cd735585aaec445f59e00b84221bcd9e669c56 (patch) | |
| tree | 92866cc8f50f0f505258c5b1158d11f1f64bd377 | |
| parent | 664edcaacced6e6eac7730e610e9490c1bb31794 (diff) | |
| download | urpmi-19cd735585aaec445f59e00b84221bcd9e669c56.tar urpmi-19cd735585aaec445f59e00b84221bcd9e669c56.tar.gz urpmi-19cd735585aaec445f59e00b84221bcd9e669c56.tar.bz2 urpmi-19cd735585aaec445f59e00b84221bcd9e669c56.tar.xz urpmi-19cd735585aaec445f59e00b84221bcd9e669c56.zip | |
enable callers to pass their own callbacks for erasure progress & errors
eg: for rpmdrake/gurpm/drakx
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | urpm/install.pm | 4 | ||||
| -rw-r--r-- | urpm/main_loop.pm | 3 |
3 files changed, 7 insertions, 2 deletions
@@ -1,4 +1,6 @@ - library: + o enable rpmdrake/gurpm/drakx to pass their own callbacks for erasure + progress & errors o enhanced doc Version 7.19 - 9 February 2013, by Thierry Vignaud diff --git a/urpm/install.pm b/urpm/install.pm index b970d93c..a6478b11 100644 --- a/urpm/install.pm +++ b/urpm/install.pm @@ -298,9 +298,9 @@ sub _get_callbacks { } }; - $options->{callback_uninst} = $options->{verbose} >= 0 ? \&install_logger : $erase_logger; + $options->{callback_uninst} ||= $options->{verbose} >= 0 ? \&install_logger : $erase_logger; - $options->{callback_error} = sub { + $options->{callback_error} ||= sub { my ($urpm, undef, $id, $subtype) = @_; my $n = $urpm->{depslist}[$id]->fullname; $urpm->{error}("ERROR: '$subtype' failed for $n: "); diff --git a/urpm/main_loop.pm b/urpm/main_loop.pm index 66b211b3..099c68da 100644 --- a/urpm/main_loop.pm +++ b/urpm/main_loop.pm @@ -217,6 +217,7 @@ sub _init_common_options { justdb => $options{justdb}, replacepkgs => $options{replacepkgs}, callback_close_helper => $callbacks->{close_helper}, + callback_error => $callbacks->{error}, callback_inst => $callbacks->{inst}, callback_open_helper => $callbacks->{open_helper}, callback_trans => $callbacks->{trans}, @@ -411,6 +412,8 @@ Parameters: =item trans() called for transaction opening/progress/end +=item error() called for cpio, script or unpacking errors + =item callback_report_uninst(): called for erasure progrses =back |