Accept VirtualBox release candidate version (ex. 4.3.14_RC1 from 4.3.14_RC1r94870)

7549735b · Hiroaki Nakamura · a03cf62a · 7549735b
Commit 7549735b authored Jul 12, 2014 by Hiroaki Nakamura
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

builder/virtualbox/common/driver_4_2.go builder/virtualbox/common/driver_4_2.go +3 -3

No files found.
--- a/builder/virtualbox/common/driver_4_2.go
+++ b/builder/virtualbox/common/driver_4_2.go
@@ -186,9 +186,9 @@ func (d *VBox42Driver) Version() (string, error) {
 		return "", fmt.Errorf("VirtualBox is not properly setup: %s", versionOutput)
 	}
-	versionRe := regexp.MustCompile("[^.0-9]")
+	versionRe := regexp.MustCompile("^[.0-9]+(?:_RC[0-9]+)?")
-	matches := versionRe.Split(versionOutput, 2)
+	matches := versionRe.FindAllString(versionOutput, 1)
-	if len(matches) == 0 || matches[0] == "" {
+	if matches == nil {
 		return "", fmt.Errorf("No version found: %s", versionOutput)
 	}