diff options
| author | Thierry Vignaud <tv@mandriva.org> | 2008-08-25 13:19:18 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mandriva.org> | 2008-08-25 13:19:18 +0000 |
| commit | c271fb2afe02cedfe41e8549a761107f2a673452 (patch) | |
| tree | 105cc91238c5dc2c84f760f421eca2484b35db87 | |
| parent | c379bda931798c8b93884acf492e36210feec32e (diff) | |
| download | rpmdrake-c271fb2afe02cedfe41e8549a761107f2a673452.tar rpmdrake-c271fb2afe02cedfe41e8549a761107f2a673452.tar.gz rpmdrake-c271fb2afe02cedfe41e8549a761107f2a673452.tar.bz2 rpmdrake-c271fb2afe02cedfe41e8549a761107f2a673452.tar.xz rpmdrake-c271fb2afe02cedfe41e8549a761107f2a673452.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.15 - 25 August 2008, Thierry Vignaud - rpmdrake: diff --git a/Rpmdrake/pkg.pm b/Rpmdrake/pkg.pm index 73a5cc26..fb080f63 100644 --- a/Rpmdrake/pkg.pm +++ b/Rpmdrake/pkg.pm @@ -109,11 +109,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"); |