dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "DefaultSettings.php: Move $wgDBname/$wgDBprefix/$wgDBmwschema closer to each...
[lhc/web/wiklou.git]
/
maintenance
/
install.php
diff --git
a/maintenance/install.php
b/maintenance/install.php
index
1dd1909
..
a71bb74
100644
(file)
--- a/
maintenance/install.php
+++ b/
maintenance/install.php
@@
-115,7
+115,12
@@
class CommandLineInstaller extends Maintenance {
$this->setPassOption();
}
$this->setPassOption();
}
- $installer = InstallerOverrides::getCliInstaller( $siteName, $adminName, $this->mOptions );
+ try {
+ $installer = InstallerOverrides::getCliInstaller( $siteName, $adminName, $this->mOptions );
+ } catch ( \MediaWiki\Installer\InstallException $e ) {
+ $this->output( $e->getStatus()->getMessage()->parse() . "\n" );
+ return false;
+ }
$status = $installer->doEnvironmentChecks();
if ( $status->isGood() ) {
$status = $installer->doEnvironmentChecks();
if ( $status->isGood() ) {
@@
-123,17
+128,21
@@
class CommandLineInstaller extends Maintenance {
} else {
$installer->showStatusMessage( $status );
} else {
$installer->showStatusMessage( $status );
- return;
+ return
false
;
}
if ( !$envChecksOnly ) {
}
if ( !$envChecksOnly ) {
- $installer->execute();
+ $status = $installer->execute();
+ if ( !$status->isGood() ) {
+ return false;
+ }
$installer->writeConfigurationFile( $this->getOption( 'confpath', $IP ) );
$installer->writeConfigurationFile( $this->getOption( 'confpath', $IP ) );
+ $installer->showMessage(
+ 'config-install-success',
+ $installer->getVar( 'wgServer' ),
+ $installer->getVar( 'wgScriptPath' )
+ );
}
}
- $installer->showMessage(
- 'config-install-success',
- $installer->getVar( 'wgServer' ),
- $installer->getVar( 'wgScriptPath' )
- );
+ return true;
}
private function setDbPassOption() {
}
private function setDbPassOption() {