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

builder/vmware: Properly check MD5

This commit is contained in:
Mitchell Hashimoto 2013-06-09 23:12:37 -07:00
parent e2214106ee
commit cbbc8de8b2
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
builder/vmware/step_download_iso.go
View File

@ -2,6 +2,7 @@ package vmware
import (
"crypto/md5"
"encoding/hex"
"fmt"
"github.com/mitchellh/multistep"
"github.com/mitchellh/packer/packer"
@ -105,7 +106,7 @@ func (stepDownloadISO) checkMD5(path string, expected string) error {
hash := md5.New()
io.Copy(hash, f)
result := strings.ToLower(string(hash.Sum(nil)))
result := strings.ToLower(hex.EncodeToString(hash.Sum(nil)))
if result != expected {
return fmt.Errorf("result != expected: %s != %s", result, expected)
}
@ -116,7 +117,7 @@ func (stepDownloadISO) checkMD5(path string, expected string) error {
func (stepDownloadISO) downloadUrl(path string, url *url.URL, progress *uint) (string, error) {
if url.Scheme == "file" {
// If it is just a file URL, then we already have the ISO
return path, nil
return url.Path, nil
}
// Otherwise, it is an HTTP URL, and we must download it.