iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

If exit code = 1 and the length of the stderr is 0, then we can assume that the exit code was not set, so assume success

This commit is contained in:
Taliesin Sisson 2015-11-03 09:41:55 +00:00
parent e8c2b49be8
commit e0c10dec12
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
builder/hyperv/common/step_shutdown.go
View File

@ -40,7 +40,6 @@ func (s *StepShutdown) Run(state multistep.StateBag) multistep.StepAction {
var stdout, stderr bytes.Buffer var stdout, stderr bytes.Buffer
cmd := &packer.RemoteCmd{ cmd := &packer.RemoteCmd{
ExitStatus: 0,
Command: s.Command, Command: s.Command,
Stdout: &stdout, Stdout: &stdout,
Stderr: &stderr, Stderr: &stderr,
@ -55,16 +54,19 @@ func (s *StepShutdown) Run(state multistep.StateBag) multistep.StepAction {
// Wait for the command to run // Wait for the command to run
cmd.Wait() cmd.Wait()
stderrString := stderr.String()
stdoutString := stdout.String()
// If the command failed to run, notify the user in some way. // If the command failed to run, notify the user in some way.
if cmd.ExitStatus != 0 { if !(cmd.ExitStatus == 0 || (cmd.ExitStatus == 1 && len(stderrString) == 0)) {
state.Put("error", fmt.Errorf( state.Put("error", fmt.Errorf(
"Shutdown command has non-zero exit status.\n\nExitStatus: %d\n\nStdout: %s\n\nStderr: %s", "Shutdown command has not successful.\n\nExitStatus: %d\n\nStdout: %s\n\nStderr: %s",
cmd.ExitStatus, stdout.String(), stderr.String())) cmd.ExitStatus, stdoutString), stderrString))
return multistep.ActionHalt return multistep.ActionHalt
} }
log.Printf("Shutdown stdout: %s", stdout.String()) log.Printf("Shutdown stdout: %s", stdoutString)
log.Printf("Shutdown stderr: %s", stderr.String()) log.Printf("Shutdown stderr: %s", stderrString)
// Wait for the machine to actually shut down // Wait for the machine to actually shut down
log.Printf("Waiting max %s for shutdown to complete", s.Timeout) log.Printf("Waiting max %s for shutdown to complete", s.Timeout)