From d99963bc2ae4222df49340bf75dff18501cb0a8b Mon Sep 17 00:00:00 2001 From: Erik Bernhardson Date: Tue, 3 Feb 2015 10:18:56 -0800 Subject: [PATCH] No such method Exception::getText() It looks like a recent change converted this try/catch statement from MWException to Exception, unfortunatly it is still calling a method that only exists on MWException. We arn't doing anything with the exception but exiting. Lets just allow the exception to be uncaught and fail naturally. The uncaught exception will still output an error and return a non-0 exit code. Change-Id: I3e0e9d283c255d2aba8139d675943e93d7cb021a --- maintenance/doMaintenance.php | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/maintenance/doMaintenance.php b/maintenance/doMaintenance.php index c93a971394..cc2167e33a 100644 --- a/maintenance/doMaintenance.php +++ b/maintenance/doMaintenance.php @@ -98,23 +98,18 @@ $maintenance->finalSetup(); require_once "$IP/includes/Setup.php"; // Do the work -try { - $maintenance->execute(); +$maintenance->execute(); - // Potentially debug globals - $maintenance->globals(); +// Potentially debug globals +$maintenance->globals(); - // Perform deferred updates. - DeferredUpdates::doUpdates( 'commit' ); +// Perform deferred updates. +DeferredUpdates::doUpdates( 'commit' ); - // log profiling info - wfLogProfilingData(); +// log profiling info +wfLogProfilingData(); - // Commit and close up! - $factory = wfGetLBFactory(); - $factory->commitMasterChanges(); - $factory->shutdown(); -} catch ( Exception $mwe ) { - echo $mwe->getText(); - exit( 1 ); -} +// Commit and close up! +$factory = wfGetLBFactory(); +$factory->commitMasterChanges(); +$factory->shutdown(); -- 2.20.1