From 4953653249dde553842c915b161c1b64ed653ebd Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Fri, 8 Jun 2012 18:51:09 +0000 Subject: (_download_callback) split it out of _download_packages() --- urpm/main_loop.pm | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/urpm/main_loop.pm b/urpm/main_loop.pm index a250c559..c8cc86ac 100644 --- a/urpm/main_loop.pm +++ b/urpm/main_loop.pm @@ -31,6 +31,14 @@ use urpm::get_pkgs; use urpm::signature; use urpm::util qw(difference2 find intersection member partition untaint); +sub _download_callback { + my ($urpm, $callbacks, $raw_msg, $msg) = @_; + if (my $download_errors = delete $urpm->{download_errors}) { + $raw_msg = join("\n", @$download_errors, ''); + } + $callbacks->{ask_yes_or_no}('', $raw_msg . "\n" . $msg . "\n" . N("Retry?")); +} + sub _download_packages { my ($urpm, $callbacks, $blists, $sources) = @_; my @error_sources; @@ -42,11 +50,7 @@ sub _download_packages { quiet => $options{verbose} < 0, callback => $callbacks->{trans_log}, ask_retry => !$urpm->{options}{auto} && ($callbacks->{ask_retry} || sub { - my ($raw_msg, $msg) = @_; - if (my $download_errors = delete $urpm->{download_errors}) { - $raw_msg = join("\n", @$download_errors, ''); - } - $callbacks->{ask_yes_or_no}('', $raw_msg . "\n" . $msg . "\n" . N("Retry?")); + _download_callback($urpm, $callbacks, @_); }), ); my @msgs; -- cgit v1.2.1