Skip to content

Commit 3e60954

Browse files
author
Olga Kopylova
committed
Merge remote-tracking branch 'origin/MAGETWO-31450-cache-noinstall' into develop
2 parents 9493fa4 + 6c910cd commit 3e60954

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

lib/internal/Magento/Framework/App/Bootstrap.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -274,11 +274,11 @@ protected function assertMaintenance()
274274
$isOn = $this->maintenance->isOn(isset($this->server['REMOTE_ADDR']) ? $this->server['REMOTE_ADDR'] : '');
275275
if ($isOn && !$isExpected) {
276276
$this->errorCode = self::ERR_MAINTENANCE;
277-
throw new \Exception('Unable to proceed: the maintenance mode is enabled.');
277+
throw new \Exception('Unable to proceed: the maintenance mode is enabled. ');
278278
}
279279
if (!$isOn && $isExpected) {
280280
$this->errorCode = self::ERR_MAINTENANCE;
281-
throw new \Exception('Unable to proceed: the maintenance mode must be enabled first.');
281+
throw new \Exception('Unable to proceed: the maintenance mode must be enabled first. ');
282282
}
283283
}
284284

@@ -298,11 +298,11 @@ protected function assertInstalled()
298298
$isInstalled = $this->isInstalled();
299299
if (!$isInstalled && $isExpected) {
300300
$this->errorCode = self::ERR_IS_INSTALLED;
301-
throw new \Exception('Application is not installed yet.');
301+
throw new \Exception('Error: Application is not installed yet. ');
302302
}
303303
if ($isInstalled && !$isExpected) {
304304
$this->errorCode = self::ERR_IS_INSTALLED;
305-
throw new \Exception('Application is already installed.');
305+
throw new \Exception('Error: Application is already installed. ');
306306
}
307307
}
308308

@@ -406,7 +406,7 @@ protected function terminate(\Exception $e)
406406
if ($this->isDeveloperMode()) {
407407
echo $e;
408408
} else {
409-
$message = "An error has happened during application run. See debug log for details.\n";
409+
$message = "An error has happened during application run. See exception log for details.\n";
410410
try {
411411
if (!$this->objectManager) {
412412
throw new \DomainException();

0 commit comments

Comments
 (0)