Merge remote-tracking branch 'mainline/develop' into NORD-PR

RuslanKostiv1 · RuslanKostiv1 · commit e0d240f751f9 · 2016-09-22T11:46:27.000+03:00
diff --git a/app/code/Magento/Catalog/Console/Command/ProductAttributesCleanUp.php b/app/code/Magento/Catalog/Console/Command/ProductAttributesCleanUp.php
@@ -101,11 +101,14 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $output->writeln("");
             $output->writeln("<info>Unused product attributes successfully cleaned up:</info>");
             $output->writeln("<comment>  " . implode("\n  ", $attributeTables) . "</comment>");
+            return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
         } catch (\Exception $exception) {
             $this->attributeResource->rollBack();
 
             $output->writeln("");
             $output->writeln("<error>{$exception->getMessage()}</error>");
+            // we must have an exit code higher than zero to indicate something was wrong
+            return \Magento\Framework\Console\Cli::RETURN_FAILURE;
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -101,11 +101,14 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`101`	`101`	`$output->writeln("");`
`102`	`102`	`$output->writeln("<info>Unused product attributes successfully cleaned up:</info>");`
`103`	`103`	`$output->writeln("<comment> " . implode("\n ", $attributeTables) . "</comment>");`
	`104`	`+ return \Magento\Framework\Console\Cli::RETURN_SUCCESS;`
`104`	`105`	`} catch (\Exception $exception) {`
`105`	`106`	`$this->attributeResource->rollBack();`
`106`	`107`
`107`	`108`	`$output->writeln("");`
`108`	`109`	`$output->writeln("<error>{$exception->getMessage()}</error>");`
	`110`	`+ // we must have an exit code higher than zero to indicate something was wrong`
	`111`	`+ return \Magento\Framework\Console\Cli::RETURN_FAILURE;`
`109`	`112`	`}`
`110`	`113`	`}`
`111`	`114`