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

iso checksumming: use checksum or checksum url if set to handle all cases

Browse Source 
fix #8322
This commit is contained in:
Adrien Delorme 2020-02-10 17:54:11 +01:00
parent 27d27463a6
commit cc3d941853
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
common/iso_config.go
View File

@ -7,7 +7,6 @@ import (
"encoding/hex"
"errors"
"fmt"
"net/url"
"strings"
getter "github.com/hashicorp/go-getter/v2"
@ -160,14 +159,13 @@ func (c *ISOConfig) Prepare(*interpolate.Context) (warnings []string, errs []err
errs = append(errs, fmt.Errorf("A checksum must be specified"))
}
if c.ISOChecksumType == "file" {
u, err := url.Parse(c.ISOUrls[0])
if err != nil {
errs = append(errs, fmt.Errorf("error parsing URL <%s>: %s",
c.ISOUrls[0], err))
url := c.ISOChecksum
if c.ISOChecksumURL != "" {
url = c.ISOChecksumURL
}
cksum, err := getter.DefaultClient.ChecksumFromFile(context.TODO(), c.ISOChecksumURL, u.Path)
if cksum == nil || err != nil {
errs = append(errs, fmt.Errorf("Couldn't extract checksum from checksum file"))
cksum, err := getter.DefaultClient.ChecksumFromFile(context.TODO(), url, c.ISOUrls[0])
if err != nil {
errs = append(errs, fmt.Errorf("Couldn't extract checksum from checksum file: %v", err))
} else {
c.ISOChecksumType = cksum.Type
c.ISOChecksum = hex.EncodeToString(cksum.Value)