summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Murawski <steven.murawski@gmail.com>2015-10-21 13:15:11 -0500
committerSteven Murawski <steven.murawski@gmail.com>2015-10-21 13:15:11 -0500
commita6c2c27021f9290c081e61f9af1a2f19e154f90c (patch)
tree2ae600e638cadb58f198131bfbe3bdc9299b71ea
parentdb2cd5e0732be6182616390d13e582335120d7cb (diff)
parent4819314b44285cc22a0a09edd3697763531454ec (diff)
downloadchef-a6c2c27021f9290c081e61f9af1a2f19e154f90c.tar.gz
Merge pull request #4087 from chef/smurawski/changelog_pr3597
Add CHANGELOG for PR #3597
-rw-r--r--CHANGELOG.md1
-rw-r--r--lib/chef/provider/powershell_script.rb3
2 files changed, 4 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ed2c37ef1d..024b016350 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
* [pr#3119](https://github.com/chef/chef/pull/3119) allow removing user, even if their GID isn't resolvable
* [pr#4068](https://github.com/chef/chef/pull/4068) update messaging from LWRP to Custom Resource in logging and spec
* [pr#4021](https://github.com/chef/chef/pull/4021) add missing requires for Chef::DSL::Recipe to LWRPBase
+* [pr#3597](https://github.com/chef/chef/pull/3597) print STDOUT from the powershell_script
## 12.5.1
diff --git a/lib/chef/provider/powershell_script.rb b/lib/chef/provider/powershell_script.rb
index cea9a45dad..e04efb6b42 100644
--- a/lib/chef/provider/powershell_script.rb
+++ b/lib/chef/provider/powershell_script.rb
@@ -199,6 +199,9 @@ elseif ( $LASTEXITCODE -ne $null -and $LASTEXITCODE -ne 0 )
$exitstatus = $LASTEXITCODE
}
+# Print STDOUT for the script execution
+Write-Output $chefscriptresult
+
# If this script is launched with -File, the process exit
# status of PowerShell.exe will be $exitstatus. If it was
# launched with -Command, it will be 0 if $exitstatus was 0,