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

allow absolute paths to isos in checksum files

This commit is contained in:
Megan Marsh 2018-07-13 09:14:59 -07:00
parent 8e22803099
commit d0f0da6626
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
common/iso_config.go
View File

@ -95,7 +95,6 @@ func (c *ISOConfig) Prepare(ctx *interpolate.Context) (warnings []string, errs [
errs = append(errs, err)
return warnings, errs
}
case "":
break
default:
@ -153,7 +152,8 @@ func (c *ISOConfig) parseCheckSumFile(rd *bufio.Reader) error {
filename := filepath.Base(u.Path)
errNotFound := fmt.Errorf("No checksum for %q or %q found at: %s", filename, relpath, c.ISOChecksumURL)
errNotFound := fmt.Errorf("No checksum for %q, %q or %q found at: %s",
filename, relpath, u.Path, c.ISOChecksumURL)
for {
line, err := rd.ReadString('\n')
if err != nil && line == "" {
@ -163,24 +163,28 @@ func (c *ISOConfig) parseCheckSumFile(rd *bufio.Reader) error {
if len(parts) < 2 {
continue
}
options := []string{filename, relpath, "./" + relpath, u.Path}
if strings.ToLower(parts[0]) == c.ISOChecksumType {
// BSD-style checksum
if parts[1] == fmt.Sprintf("(%s)", filename) || parts[1] == fmt.Sprintf("(%s)", relpath) ||
parts[1] == fmt.Sprintf("(./%s)", relpath) {
for _, match := range options {
if parts[1] == fmt.Sprintf("(%s)", match) {
c.ISOChecksum = parts[3]
return nil
}
}
} else {
// Standard checksum
if parts[1][0] == '*' {
// Binary mode
parts[1] = parts[1][1:]
}
if parts[1] == filename || parts[1] == relpath || parts[1] == "./"+relpath {
for _, match := range options {
if parts[1] == match {
c.ISOChecksum = parts[0]
return nil
}
}
}
}
return errNotFound
}