Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Show regular output when errorOutput is empty #1554

Merged
merged 2 commits into from
Feb 18, 2018
Merged

Show regular output when errorOutput is empty #1554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b897a2
Show regular output when errorOutput is empty
barryvdh Feb 17, 2018
05cfd91
Update CHANGELOG.md
barryvdh Feb 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
- Throw meaningfull exception on errors in cd() [#1480]
- Make sure Context::pop() is called when Callback errors in on(...) function [#1513]
- Update silverstripe recipe to support silverstripe 4
- Show standard output in exceptions when error output is empty [#1554]

## v6.0.5
[v6.0.4...v6.0.5](https://github.com/deployphp/deployer/compare/v6.0.4...v6.0.5)
Expand Down Expand Up @@ -349,7 +350,7 @@
- Fixed typo3 recipe
- Fixed remove of shared dir on first deploy


[#1554]: https://github.com/deployphp/deployer/pull/1554
[#1521]: https://github.com/deployphp/deployer/pull/1521
[#1513]: https://github.com/deployphp/deployer/pull/1513
[#1481]: https://github.com/deployphp/deployer/issues/1481
Expand Down
2 changes: 1 addition & 1 deletion src/Exception/RuntimeException.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public function __construct($hostname, $command, $exitCode, $output, $errorOutpu

$message .= sprintf(
"\n\n================\n%s",
$errorOutput
trim($errorOutput) ? $errorOutput : $output
);

parent::__construct($message, $exitCode);
Expand Down