| Index: branches/FileBackend/phase3/maintenance/language/messages.inc |
| — | — | @@ -1347,6 +1347,36 @@ |
| 1348 | 1348 | 'upload-http-error', |
| 1349 | 1349 | ), |
| 1350 | 1350 | |
| | 1351 | + 'filebackend-errors' => array( |
| | 1352 | + 'backend-fail-stream', |
| | 1353 | + 'backend-fail-backup', |
| | 1354 | + 'backend-fail-notexists', |
| | 1355 | + 'backend-fail-hashes', |
| | 1356 | + 'backend-fail-notsame', |
| | 1357 | + 'backend-fail-invalidpath', |
| | 1358 | + 'backend-fail-delete', |
| | 1359 | + 'backend-fail-alreadyexists', |
| | 1360 | + 'backend-fail-copy', |
| | 1361 | + 'backend-fail-move', |
| | 1362 | + 'backend-fail-opentemp', |
| | 1363 | + 'backend-fail-writetemp', |
| | 1364 | + 'backend-fail-closetemp', |
| | 1365 | + 'backend-fail-read', |
| | 1366 | + 'backend-fail-create', |
| | 1367 | + ), |
| | 1368 | + |
| | 1369 | + 'lockmanger-errors' => array( |
| | 1370 | + 'lockmanager-notlocked', |
| | 1371 | + 'lockmanager-fail-closelock', |
| | 1372 | + 'lockmanager-fail-deletelock', |
| | 1373 | + 'lockmanager-fail-acquirelock', |
| | 1374 | + 'lockmanager-fail-openlock', |
| | 1375 | + 'lockmanager-fail-releaselock', |
| | 1376 | + 'lockmanager-fail-acquirelocks', |
| | 1377 | + 'lockmanager-fail-db-bucket', |
| | 1378 | + 'lockmanager-fail-db-release' |
| | 1379 | + ), |
| | 1380 | + |
| 1351 | 1381 | 'zip' => array( |
| 1352 | 1382 | 'zip-file-open-error', |
| 1353 | 1383 | 'zip-wrong-format', |
| Index: branches/FileBackend/phase3/includes/filerepo/backend/LockManager.php |
| — | — | @@ -340,7 +340,7 @@ |
| 341 | 341 | if ( $res === 'cantacquire' ) { |
| 342 | 342 | // Resources already locked by another process. |
| 343 | 343 | // Abort and unlock everything we just locked. |
| 344 | | - $status->fatal( 'lockmanager-fail-acquirelocks' ); |
| | 344 | + $status->fatal( 'lockmanager-fail-acquirelocks', implode( ', ', $keys ) ); |
| 345 | 345 | $status->merge( $this->doUnlock( $lockedKeys, $type ) ); |
| 346 | 346 | return $status; |
| 347 | 347 | } elseif ( $res !== true ) { |
| Index: branches/FileBackend/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -2271,6 +2271,17 @@ |
| 2272 | 2272 | 'backend-fail-read' => 'Could not read file $1', |
| 2273 | 2273 | 'backend-fail-create' => 'Could not create file $1', |
| 2274 | 2274 | |
| | 2275 | +# lock manager |
| | 2276 | +'lockmanager-notlocked' => 'Could not unlock key "$1"; it is not locked.', |
| | 2277 | +'lockmanager-fail-closelock' => 'Could not close lock file for key "$1".', |
| | 2278 | +'lockmanager-fail-deletelock' => 'Could not delete lock file for key "$1".', |
| | 2279 | +'lockmanager-fail-openlock' => 'Could not open lock file for key "$1".', |
| | 2280 | +'lockmanager-fail-acquirelock' => 'Could not acquire lock for key "$1".', |
| | 2281 | +'lockmanager-fail-releaselock' => 'Could not release lock for key "$1".', |
| | 2282 | +'lockmanager-fail-acquirelocks' => 'Could not acquire locks for keys "$1".', |
| | 2283 | +'lockmanager-fail-db-bucket' => 'Could not contact enough lock servers in bucket $1', |
| | 2284 | +'lockmanager-fail-db-release' => 'Could not release locks on server $1', |
| | 2285 | + |
| 2275 | 2286 | # img_auth script messages |
| 2276 | 2287 | 'img-auth-accessdenied' => 'Access denied', |
| 2277 | 2288 | 'img-auth-nopathinfo' => 'Missing PATH_INFO. |