diff options
| author | Thierry Vignaud <tv@mandriva.org> | 2008-08-25 13:19:10 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mandriva.org> | 2008-08-25 13:19:10 +0000 |
| commit | a74975e21cd9bb6083336f3dd2461983230e1b6f (patch) | |
| tree | c3c8c901af10e35871c267b287dbb79a6ee04809 | |
| parent | aad1990d0520b979aa5c1835099e027276233769 (diff) | |
| download | rpmdrake-a74975e21cd9bb6083336f3dd2461983230e1b6f.tar rpmdrake-a74975e21cd9bb6083336f3dd2461983230e1b6f.tar.gz rpmdrake-a74975e21cd9bb6083336f3dd2461983230e1b6f.tar.bz2 rpmdrake-a74975e21cd9bb6083336f3dd2461983230e1b6f.tar.xz rpmdrake-a74975e21cd9bb6083336f3dd2461983230e1b6f.zip | |
(extract_header) workaround crashing when media's MD5SUM are garbaged (#41352)
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | Rpmdrake/pkg.pm | 4 |
2 files changed, 5 insertions, 2 deletions
@@ -1,3 +1,6 @@ +- rpmdrake: + o workaround crashing when media's MD5SUM are garbaged (#41352) + Version 4.9.13.2 - 25 August 2008, Thierry Vignaud - rpmdrake: diff --git a/Rpmdrake/pkg.pm b/Rpmdrake/pkg.pm index 917b6f6f..38c1a699 100644 --- a/Rpmdrake/pkg.pm +++ b/Rpmdrake/pkg.pm @@ -105,11 +105,11 @@ sub extract_header { my $gurpm; $bar_id = statusbar_msg(N("Getting '%s' from XML meta-data...", $xml_info), 0); my $_gurpm_clean_guard = before_leaving { undef $gurpm }; - if (my $xml_info_file = urpm::media::any_xml_info($urpm, $medium, $xml_info, undef, sub { + if (my $xml_info_file = eval { urpm::media::any_xml_info($urpm, $medium, $xml_info, undef, sub { $gurpm ||= Rpmdrake::gurpm->new(N("Please wait"), transient => $::main_window); download_callback($gurpm, @_) or goto header_non_available; - })) { + }) }) { require urpm::xml_info; require urpm::xml_info_pkg; $urpm->{log}("getting information from $xml_info_file"); |