diff options
author | Thierry Vignaud <tv@mandriva.org> | 2007-06-20 10:57:14 +0000 |
---|---|---|
committer | Thierry Vignaud <tv@mandriva.org> | 2007-06-20 10:57:14 +0000 |
commit | e51801b0061f715defcf7d1c56a05fa7cea14578 (patch) | |
tree | f2a3e6ceacc8e51609d3d73334a43762024df64a /Rpmdrake/pkg.pm | |
parent | de314460aed39062d0f16ce114ce6fed36eaf5a5 (diff) | |
download | rpmdrake-e51801b0061f715defcf7d1c56a05fa7cea14578.tar rpmdrake-e51801b0061f715defcf7d1c56a05fa7cea14578.tar.gz rpmdrake-e51801b0061f715defcf7d1c56a05fa7cea14578.tar.bz2 rpmdrake-e51801b0061f715defcf7d1c56a05fa7cea14578.tar.xz rpmdrake-e51801b0061f715defcf7d1c56a05fa7cea14578.zip |
(perform_installation) partially revert r219992: explicitly destroy
the progress window when it's over but we've sg to display before
returning (error, ...)
Diffstat (limited to 'Rpmdrake/pkg.pm')
-rwxr-xr-x | Rpmdrake/pkg.pm | 4 |
1 files changed, 4 insertions, 0 deletions
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.")); } |