summaryrefslogtreecommitdiffstats
path: root/urpm/lock.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-03-17 16:08:51 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-03-17 16:08:51 +0000
commit6b4a7c43b28da5b905b3e29a162feb5d130e276c (patch)
treea30f0fd8ce5156360fe234e17c7999202851d450 /urpm/lock.pm
parent725b71ba4a2e322b58f05605d9d973c1d8e31d35 (diff)
downloadurpmi-6b4a7c43b28da5b905b3e29a162feb5d130e276c.tar
urpmi-6b4a7c43b28da5b905b3e29a162feb5d130e276c.tar.gz
urpmi-6b4a7c43b28da5b905b3e29a162feb5d130e276c.tar.bz2
urpmi-6b4a7c43b28da5b905b3e29a162feb5d130e276c.tar.xz
urpmi-6b4a7c43b28da5b905b3e29a162feb5d130e276c.zip
- urpmi:
o nicer error message when database is locked (#38923)
Diffstat (limited to 'urpm/lock.pm')
-rw-r--r--urpm/lock.pm4
1 files changed, 2 insertions, 2 deletions
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;