Tiny fix to replace some duplicate code with usage of the `halt` closure in the StepCloneVMX step for the vmware-vmx builder.
This commit is contained in:
parent
32f226eda0
commit
1a36458e9e
|
@ -39,9 +39,7 @@ func (s *StepCloneVMX) Run(_ context.Context, state multistep.StateBag) multiste
|
|||
log.Printf("Cloning to: %s", vmxPath)
|
||||
|
||||
if err := driver.Clone(vmxPath, s.Path, s.Linked); err != nil {
|
||||
state.Put("error", err)
|
||||
return halt(err)
|
||||
|
||||
}
|
||||
|
||||
// Read in the machine configuration from the cloned VMX file
|
||||
|
@ -102,8 +100,7 @@ func (s *StepCloneVMX) Run(_ context.Context, state multistep.StateBag) multiste
|
|||
}
|
||||
|
||||
if len(diskFullPaths) == 0 {
|
||||
state.Put("error", fmt.Errorf("Could not enumerate disk info from the vmx file"))
|
||||
return multistep.ActionHalt
|
||||
return halt(fmt.Errorf("Could not enumerate disk info from the vmx file"))
|
||||
}
|
||||
|
||||
// Determine the network type by reading out of the .vmx
|
||||
|
|
Loading…
Reference in New Issue