From e724d14495561be8f80c7bba4e81476cb3fb9d3d Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Tue, 24 May 2016 00:06:36 -0700 Subject: [PATCH] Add the LockManager error to LocalFileLockError exceptions Change-Id: Ibfa7312993806554f7939b4f5692e30714f71304 --- includes/filerepo/file/LocalFile.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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++; -- 2.20.1