From c5da8c5c3727434ad6b424e57ea68b3b802c467a Mon Sep 17 00:00:00 2001 From: Adrien Delorme Date: Mon, 23 Nov 2020 10:29:12 +0100 Subject: [PATCH] Fix salt-masterless provisioner after merge conflict compilation error (#10296) This is most likely due to the merge between #10291 and #10257 ( that moves WindowsOSType into guestexec. This fixes #10291 --- provisioner/salt-masterless/provisioner.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/provisioner/salt-masterless/provisioner.go b/provisioner/salt-masterless/provisioner.go index 7b50d87e6..fbf67db0e 100644 --- a/provisioner/salt-masterless/provisioner.go +++ b/provisioner/salt-masterless/provisioner.go @@ -398,7 +398,7 @@ func (p *Provisioner) Provision(ctx context.Context, ui packer.Ui, comm packer.C } } - if p.config.GuestOSType == provisioner.WindowsOSType { + if p.config.GuestOSType == guestexec.WindowsOSType { ui.Message("Downloading Git for Windows") cmd1 := &packer.RemoteCmd{Command: fmt.Sprintf("powershell [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; Invoke-WebRequest -Uri https://github.com/git-for-windows/git/releases/download/v2.28.0.windows.1/Git-2.28.0-64-bit.exe -OutFile $env:TEMP/Git.exe")} if err = cmd1.RunWithUi(ctx, comm, ui); (err != nil || cmd1.ExitStatus() != 0) && !p.config.NoExitOnFailure {