From c033a52ddbe927ec8107bcc5252614cea04023f7 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Sat, 21 Dec 2013 04:31:23 +0100 Subject: fix displaying that the db is locked instead of an error message --- NEWS | 2 ++ Rpmdrake/pkg.pm | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) 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; -- cgit v1.2.1