dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
8b95846
)
Add the LockManager error to LocalFileLockError exceptions
author
Aaron Schulz
<aschulz@wikimedia.org>
Tue, 24 May 2016 07:06:36 +0000
(
00:06
-0700)
committer
Aaron Schulz
<aschulz@wikimedia.org>
Tue, 24 May 2016 07:06:36 +0000
(
00:06
-0700)
Change-Id: Ibfa7312993806554f7939b4f5692e30714f71304
includes/filerepo/file/LocalFile.php
patch
|
blob
|
history
diff --git
a/includes/filerepo/file/LocalFile.php
b/includes/filerepo/file/LocalFile.php
index
2a15fd7
..
20fec24
100644
(file)
--- a/
includes/filerepo/file/LocalFile.php
+++ b/
includes/filerepo/file/LocalFile.php
@@
-1928,7
+1928,9
@@
class LocalFile extends File {
$dbw->rollback( __METHOD__ );
}
throw new LocalFileLockError(
- "Could not acquire lock for '{$this->getName()}' ($waited sec)." );
+ "Could not acquire lock for '{$this->getName()} ($waited sec): " .
+ $status->getWikiText( false, false, 'en' )
+ );
}
// Release the lock *after* commit to avoid row-level contention
$this->locked++;