From: Aaron Schulz <aschulz@wikimedia.org>
Date: Tue, 24 May 2016 07:06:36 +0000 (-0700)
Subject: Add the LockManager error to LocalFileLockError exceptions
X-Git-Tag: 1.31.0-rc.0~6845
X-Git-Url: http://git.cyclocoop.org//%22javascript:ModifierStyle%28%27%22.%24id.%22%27%29/%22?a=commitdiff_plain;h=e724d14495561be8f80c7bba4e81476cb3fb9d3d;p=lhc%2Fweb%2Fwiklou.git

Add the LockManager error to LocalFileLockError exceptions

Change-Id: Ibfa7312993806554f7939b4f5692e30714f71304
---

diff --git a/includes/filerepo/file/LocalFile.php b/includes/filerepo/file/LocalFile.php
index 2a15fd7ab6..20fec24669 100644
--- 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++;