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

fix relative pathing versus iso checksum dir to work even if user has provided a relative path for the iso_url which is relative to the directory where Packer is run.

This commit is contained in:
Megan Marsh 2018-07-13 09:21:04 -07:00
parent d0f0da6626
commit 0df33cd032
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
common/iso_config.go
View File

@ -145,7 +145,12 @@ func (c *ISOConfig) parseCheckSumFile(rd *bufio.Reader) error {
return err
}
relpath, err := filepath.Rel(filepath.Dir(checksumurl.Path), u.Path)
absPath, err := filepath.Abs(u.Path)
if err != nil {
return fmt.Errorf("Unable to generate absolute path from provided iso_url: %s", err)
}
relpath, err := filepath.Rel(filepath.Dir(checksumurl.Path), absPath)
if err != nil {
return err
}
@ -163,7 +168,7 @@ func (c *ISOConfig) parseCheckSumFile(rd *bufio.Reader) error {
if len(parts) < 2 {
continue
}
options := []string{filename, relpath, "./" + relpath, u.Path}
options := []string{filename, relpath, "./" + relpath, absPath}
if strings.ToLower(parts[0]) == c.ISOChecksumType {
// BSD-style checksum
for _, match := range options {