aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2007-06-20 11:01:57 +0000
committerThierry Vignaud <tv@mandriva.org>2007-06-20 11:01:57 +0000
commit6f402de6d358b78c87154a019b7530d0c06f736a (patch)
tree4236b7630191ec1e23658a6161b9f64f295548fc
parente51801b0061f715defcf7d1c56a05fa7cea14578 (diff)
downloadrpmdrake-6f402de6d358b78c87154a019b7530d0c06f736a.tar
rpmdrake-6f402de6d358b78c87154a019b7530d0c06f736a.tar.gz
rpmdrake-6f402de6d358b78c87154a019b7530d0c06f736a.tar.bz2
rpmdrake-6f402de6d358b78c87154a019b7530d0c06f736a.tar.xz
rpmdrake-6f402de6d358b78c87154a019b7530d0c06f736a.zip
(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, ...
-rwxr-xr-xRpmdrake/pkg.pm7
1 files changed, 4 insertions, 3 deletions
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."));
}