From e51801b0061f715defcf7d1c56a05fa7cea14578 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 20 Jun 2007 10:57:14 +0000 Subject: (perform_installation) partially revert r219992: explicitly destroy the progress window when it's over but we've sg to display before returning (error, ...) --- Rpmdrake/pkg.pm | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'Rpmdrake') diff --git a/Rpmdrake/pkg.pm b/Rpmdrake/pkg.pm index 4f6d5450..95a21b55 100755 --- a/Rpmdrake/pkg.pm +++ b/Rpmdrake/pkg.pm @@ -470,6 +470,7 @@ sub perform_installation { #- (partially) duplicated from /usr/sbin/urpmi :-( local $urpm->{fatal} = sub { my $fatal_msg = $_[1]; printf STDERR "Fatal: %s\n", $fatal_msg; + Rpmdrake::gurpm::end(); interactive_msg(N("Installation failed"), N("There was a problem during the installation:\n\n%s", $fatal_msg)); goto return_with_exit_code; @@ -739,6 +740,8 @@ sub perform_installation { #- (partially) duplicated from /usr/sbin/urpmi :-( goto return_with_exit_code; } + Rpmdrake::gurpm::end(); + if (@errors || @error_msgs) { interactive_msg( N("Problem during installation"), @@ -788,6 +791,7 @@ you may now inspect some in order to take actions:"), ); } } else { + Rpmdrake::gurpm::end(); interactive_msg(N("Error"), N("Unrecoverable error: no package found for installation, sorry.")); } -- cgit v1.2.1