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

Merge pull request #1509 from kamazee/fix_detecting_guest_additions_when_sysprop_empty

Browse Source 
Fix detecting guest additions URL
This commit is contained in:
Mitchell Hashimoto 2014-10-27 17:04:03 -07:00
commit 83772fc5b8
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
builder/virtualbox/common/driver_4_2.go
View File

@ -49,11 +49,12 @@ func (d *VBox42Driver) Iso() (string, error) {
return "", err return "", err
} }
DefaultGuestAdditionsRe := regexp.MustCompile("Default Guest Additions ISO:(.*)") DefaultGuestAdditionsRe := regexp.MustCompile("Default Guest Additions ISO:(.+)")
for _, line := range strings.Split(stdout.String(), "\n") { for _, line := range strings.Split(stdout.String(), "\n") {
// Need to trim off CR character when running in windows // Need to trim off CR character when running in windows
line = strings.TrimRight(line, "\r") // Trimming whitespaces at this point helps to filter out empty value
line = strings.TrimRight(line, " \r")
matches := DefaultGuestAdditionsRe.FindStringSubmatch(line) matches := DefaultGuestAdditionsRe.FindStringSubmatch(line)
if matches == nil { if matches == nil {
@ -66,7 +67,7 @@ func (d *VBox42Driver) Iso() (string, error) {
return isoname, nil return isoname, nil
} }
return "", fmt.Errorf("Cannot find \"Default Guest Additions ISO\" in vboxmanage output") return "", fmt.Errorf("Cannot find \"Default Guest Additions ISO\" in vboxmanage output (or it is empty)")
} }
func (d *VBox42Driver) Import(name string, path string, flags []string) error { func (d *VBox42Driver) Import(name string, path string, flags []string) error {