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

Merge pull request #8206 from dvrkps/patch-1 

Remove explicit err var declaration
This commit is contained in:
Adrien Delorme 2019-10-09 16:26:01 +02:00 committed by GitHub
parent c505f1c45e 50262ba0b8
commit bdc4213a1e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builder/hyperv/common/step_create_external_switch.go
View File

@ -84,8 +84,6 @@ func (s *StepCreateExternalSwitch) Cleanup(state multistep.StateBag) {
ui.Say("Unregistering and deleting external switch...") ui.Say("Unregistering and deleting external switch...")
var err error = nil
errMsg := "Error deleting external switch: %s" errMsg := "Error deleting external switch: %s"
// connect the vm to the old switch // connect the vm to the old switch
@ -94,7 +92,7 @@ func (s *StepCreateExternalSwitch) Cleanup(state multistep.StateBag) {
return return
} }
err = driver.ConnectVirtualMachineNetworkAdapterToSwitch(vmName, s.oldSwitchName) err := driver.ConnectVirtualMachineNetworkAdapterToSwitch(vmName, s.oldSwitchName)
if err != nil { if err != nil {
ui.Error(fmt.Sprintf(errMsg, err)) ui.Error(fmt.Sprintf(errMsg, err))
return return