Merge pull request #8394 from hashicorp/fix_iso_target_path

Don't cache when TargetPath is non-nil
This commit is contained in:
Megan Marsh 2019-12-02 16:24:56 -08:00 committed by GitHub
commit 76bfaf9da8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions

View File

@ -150,11 +150,12 @@ func (s *StepDownload) download(ctx context.Context, ui packer.Ui, source string
if s.Extension != "" {
targetPath += "." + s.Extension
}
targetPath, err = packer.CachePath(targetPath)
if err != nil {
return "", fmt.Errorf("CachePath: %s", err)
}
}
targetPath, err = packer.CachePath(targetPath)
if err != nil {
return "", fmt.Errorf("CachePath: %s", err)
}
lockFile := targetPath + ".lock"
log.Printf("Acquiring lock for: %s (%s)", u.String(), lockFile)