From 6f402de6d358b78c87154a019b7530d0c06f736a Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 20 Jun 2007 11:01:57 +0000 Subject: (perform_installation) factorize explicitly destroying the progress window when it's over so that it's also done if we need to display rpmnew/rpmsave files, ... --- Rpmdrake/pkg.pm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'Rpmdrake') diff --git a/Rpmdrake/pkg.pm b/Rpmdrake/pkg.pm index 95a21b55..955e4103 100755 --- a/Rpmdrake/pkg.pm +++ b/Rpmdrake/pkg.pm @@ -726,6 +726,10 @@ sub perform_installation { #- (partially) duplicated from /usr/sbin/urpmi :-( } } + # explicitly destroy the progress window when it's over; we may + # have sg to display before returning (errors, rpmnew/rpmsave, ...): + Rpmdrake::gurpm::end(); + undef $lock; undef $rpm_lock; if (@rpms_install || @rpms_upgrade || @to_remove) { @@ -740,8 +744,6 @@ 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"), @@ -791,7 +793,6 @@ 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