aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2013-12-21 04:31:23 +0100
committerThierry Vignaud <thierry.vignaud@gmail.com>2013-12-21 04:31:23 +0100
commitc033a52ddbe927ec8107bcc5252614cea04023f7 (patch)
treeb258a52acee029c21db79b219321ca00b7e2f139
parent05906e1eda9c885ea5a4bd573ef588dd61f91e9e (diff)
downloadrpmdrake-c033a52ddbe927ec8107bcc5252614cea04023f7.tar
rpmdrake-c033a52ddbe927ec8107bcc5252614cea04023f7.tar.gz
rpmdrake-c033a52ddbe927ec8107bcc5252614cea04023f7.tar.bz2
rpmdrake-c033a52ddbe927ec8107bcc5252614cea04023f7.tar.xz
rpmdrake-c033a52ddbe927ec8107bcc5252614cea04023f7.zip
fix displaying that the db is locked instead of an error message
-rw-r--r--NEWS2
-rw-r--r--Rpmdrake/pkg.pm2
2 files changed, 3 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index c22b7a25..85756d44 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- fix displaying that the db is locked instead of an error message
+
Version 6.4 - 13 December 2013, Thierry Vignaud
- edit-urpm-sources:
diff --git a/Rpmdrake/pkg.pm b/Rpmdrake/pkg.pm
index ddd24804..e9229b86 100644
--- a/Rpmdrake/pkg.pm
+++ b/Rpmdrake/pkg.pm
@@ -645,7 +645,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;
- $gurpm->destroy;
+ $gurpm->destroy if $gurpm;
interactive_msg(N("Installation failed"),
N("There was a problem during the installation:\n\n%s", $fatal_msg));
goto return_with_exit_code;