fix disabling vmware tools for ESX

builder/vmware/common/step_upload_tools.go

@@ -23,6 +23,10 @@ type StepUploadTools struct {
 func (c *StepUploadTools) Run(state multistep.StateBag) multistep.StepAction {
 	driver := state.Get("driver").(Driver)
 
+	if c.ToolsUploadFlavor == "" {
+		return multistep.ActionContinue
+	}
+
 	if c.RemoteType == "esx5" {
 		if err := driver.ToolsInstall(); err != nil {
 			state.Put("error", fmt.Errorf("Couldn't mount VMware tools ISO. Please check the 'guest_os_type' in your template.json."))
@@ -30,10 +34,6 @@ func (c *StepUploadTools) Run(state multistep.StateBag) multistep.StepAction {
 		return multistep.ActionContinue
 	}
 
-	if c.ToolsUploadFlavor == "" {
-		return multistep.ActionContinue
-	}
-
 	comm := state.Get("communicator").(packer.Communicator)
 	tools_source := state.Get("tools_upload_source").(string)
 	ui := state.Get("ui").(packer.Ui)