Allow install.php to run env-checks with no db

Bug: T169668
Change-Id: Ibb05b26cbf2d26c02ee7f26497e16d2c98e97de2

diff --git a/maintenance/doMaintenance.php b/maintenance/doMaintenance.php
index e649c9d..53a317a 100644 (file)
--- a/maintenance/doMaintenance.php
+++ b/maintenance/doMaintenance.php
@@ -113,14 +113,18 @@ $maintenance->execute();
 // Potentially debug globals
 $maintenance->globals();
 
-// Perform deferred updates.
-$lbFactory = MediaWikiServices::getInstance()->getDBLoadBalancerFactory();
-$lbFactory->commitMasterChanges( $maintClass );
-DeferredUpdates::doUpdates();
+if ( $maintenance->getDbType() !== Maintenance::DB_NONE ) {
+       // Perform deferred updates.
+       $lbFactory = MediaWikiServices::getInstance()->getDBLoadBalancerFactory();
+       $lbFactory->commitMasterChanges( $maintClass );
+       DeferredUpdates::doUpdates();
+}
 
 // log profiling info
 wfLogProfilingData();
 
-// Commit and close up!
-$lbFactory->commitMasterChanges( 'doMaintenance' );
-$lbFactory->shutdown( $lbFactory::SHUTDOWN_NO_CHRONPROT );
+if ( isset( $lbFactory ) ) {
+       // Commit and close up!
+       $lbFactory->commitMasterChanges( 'doMaintenance' );
+       $lbFactory->shutdown( $lbFactory::SHUTDOWN_NO_CHRONPROT );
+}

diff --git a/maintenance/install.php b/maintenance/install.php
index 81b6d9c..cac3009 100644 (file)
--- a/maintenance/install.php
+++ b/maintenance/install.php
@@ -90,6 +90,13 @@ class CommandLineInstaller extends Maintenance {
                $this->addOption( 'env-checks', "Run environment checks only, don't change anything" );
        }
 
+       public function getDbType() {
+               if ( $this->hasOption( 'env-checks' ) ) {
+                       return Maintenance::DB_NONE;
+               }
+               return parent::getDbType();
+       }
+
        function execute() {
                global $IP;