From 9cf78edcf010d3b48a6534567d20b4f63bb9eda0 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Mon, 1 Jul 2013 10:59:04 -0700 Subject: [PATCH] builder/virtualbox: trim whitespace when getting version --- CHANGELOG.md | 1 + builder/virtualbox/driver.go | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c7d19356..7a2f6337f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ IMPROVEMENTS: BUG FIXES: * core: More plugin server fixes that avoid hangs on OS X 10.7 [GH-87] +* virtualbox: More robust version parsing for uploading guest additions. [GH-69] ## 0.1.2 (June 29, 2013) diff --git a/builder/virtualbox/driver.go b/builder/virtualbox/driver.go index b0b261260..b36b5c636 100644 --- a/builder/virtualbox/driver.go +++ b/builder/virtualbox/driver.go @@ -124,11 +124,12 @@ func (d *VBox42Driver) Version() (string, error) { return "", err } - log.Printf("VBoxManage --version output: %s", stdout.String()) + versionOutput := strings.TrimSpace(stdout.String()) + log.Printf("VBoxManage --version output: %s", versionOutput) versionRe := regexp.MustCompile("[^.0-9]") - matches := versionRe.Split(stdout.String(), 2) + matches := versionRe.Split(versionOutput, 2) if len(matches) == 0 { - return "", fmt.Errorf("No version found: %s", stdout.String()) + return "", fmt.Errorf("No version found: %s", versionOutput) } log.Printf("VirtualBox version: %s", matches[0])