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 "StringUtils: Add a utility for checking if a string is a valid regex"
[lhc/web/wiklou.git]
/
includes
/
installer
/
CliInstaller.php
diff --git
a/includes/installer/CliInstaller.php
b/includes/installer/CliInstaller.php
index
99d594d
..
0ff34b0
100644
(file)
--- a/
includes/installer/CliInstaller.php
+++ b/
includes/installer/CliInstaller.php
@@
-120,7
+120,11
@@
class CliInstaller extends Installer {
}
$this->setVar( '_Extensions', $status->value );
} elseif ( isset( $options['with-extensions'] ) ) {
}
$this->setVar( '_Extensions', $status->value );
} elseif ( isset( $options['with-extensions'] ) ) {
- $this->setVar( '_Extensions', array_keys( $this->findExtensions() ) );
+ $status = $this->findExtensions();
+ if ( !$status->isOK() ) {
+ throw new InstallException( $status );
+ }
+ $this->setVar( '_Extensions', array_keys( $status->value ) );
}
// Set up the default skins
}
// Set up the default skins
@@
-131,7
+135,11
@@
class CliInstaller extends Installer {
}
$skins = $status->value;
} else {
}
$skins = $status->value;
} else {
- $skins = array_keys( $this->findExtensions( 'skins' ) );
+ $status = $this->findExtensions( 'skins' );
+ if ( !$status->isOK() ) {
+ throw new InstallException( $status );
+ }
+ $skins = array_keys( $status->value );
}
$this->setVar( '_Skins', $skins );
}
$this->setVar( '_Skins', $skins );
@@
-190,7
+198,7
@@
class CliInstaller extends Installer {
// PerformInstallation bails on a fatal, so make sure the last item
// completed before giving 'next.' Likewise, only provide back on failure
$lastStepStatus = end( $result );
// PerformInstallation bails on a fatal, so make sure the last item
// completed before giving 'next.' Likewise, only provide back on failure
$lastStepStatus = end( $result );
- if ( $lastStepStatus->isO
k
() ) {
+ if ( $lastStepStatus->isO
K
() ) {
return Status::newGood();
} else {
return $lastStepStatus;
return Status::newGood();
} else {
return $lastStepStatus;