From 6b4a7c43b28da5b905b3e29a162feb5d130e276c Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Mon, 17 Mar 2008 16:08:51 +0000
Subject: - urpmi:   o nicer error message when database is locked (#38923)

---
 NEWS         | 3 +++
 urpm/lock.pm | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index ae6c04ea..42b19a32 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+- urpmi:
+  o nicer error message when database is locked (#38923)
+
 Version 5.13 - 17 March 2008, by Pascal "Pixel" Rigaux
 
 - gurpmi:
diff --git a/urpm/lock.pm b/urpm/lock.pm
index ea59a983..87ed2df7 100644
--- a/urpm/lock.pm
+++ b/urpm/lock.pm
@@ -59,10 +59,10 @@ sub _lock {
     my $mode = $b_exclusive ? $LOCK_EX : $LOCK_SH;
     if (!flock($lock->{fh}, $mode | $LOCK_NB)) {
 	if ($b_wait) {
-	    $lock->{info}(N("%s database locked. waiting...", $lock->{db_name}));
+	    $lock->{info}(N("%s database is locked. waiting...", $lock->{db_name}));
 	    flock($lock->{fh}, $mode) or $lock->{fatal}(N("aborting"));
 	} else {
-	    $lock->{fatal}(N("%s database locked", $lock->{db_name}));
+	    $lock->{fatal}(N("%s database is locked (another program is already using it)", $lock->{db_name}));
 	}
     }
     $lock->{locked} = 1;
-- 
cgit v1.2.1