MAGETWO-53474: [Github] Caches Aren't Enabled by Default on RC1 with Composer when Upgrading via CLI

ark99 · ark99 · commit 4c9841e743f1 · 2016-06-08T13:52:53.000-05:00
- Update based on review.
- Added returned error code to logged message.
diff --git a/setup/src/Magento/Setup/Console/Command/UpgradeCommand.php b/setup/src/Magento/Setup/Console/Command/UpgradeCommand.php
@@ -127,7 +127,8 @@ private function enableCaches($objectManager, $output)
 
             $write->delete($pathToCacheStatus);
             if (isset($returnCode) && $returnCode > 0) {
-                $output->writeln('<error> Error occured during upgrade</error>');
+                $message = '<error> Error occured during upgrade. Error code: ' . $returnCode . '</error>';
+                $output->writeln($message);
                 return \Magento\Framework\Console\Cli::RETURN_FAILURE;
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,8 @@ private function enableCaches($objectManager, $output)`
`127`	`127`
`128`	`128`	`$write->delete($pathToCacheStatus);`
`129`	`129`	`if (isset($returnCode) && $returnCode > 0) {`
`130`		`- $output->writeln('<error> Error occured during upgrade</error>');`
	`130`	`+ $message = '<error> Error occured during upgrade. Error code: ' . $returnCode . '</error>';`
	`131`	`+ $output->writeln($message);`
`131`	`132`	`return \Magento\Framework\Console\Cli::RETURN_FAILURE;`
`132`	`133`	`}`
`133`	`134`	`}`