From 7549735bd31985e77bdad376fb7ac0241cb68b45 Mon Sep 17 00:00:00 2001 From: Hiroaki Nakamura Date: Sat, 12 Jul 2014 19:08:10 +0900 Subject: [PATCH] Accept VirtualBox release candidate version (ex. 4.3.14_RC1 from 4.3.14_RC1r94870) --- builder/virtualbox/common/driver_4_2.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/builder/virtualbox/common/driver_4_2.go b/builder/virtualbox/common/driver_4_2.go index fc383c5b8..901822174 100644 --- 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]") - matches := versionRe.Split(versionOutput, 2) - if len(matches) == 0 || matches[0] == "" { + versionRe := regexp.MustCompile("^[.0-9]+(?:_RC[0-9]+)?") + matches := versionRe.FindAllString(versionOutput, 1) + if matches == nil { return "", fmt.Errorf("No version found: %s", versionOutput) }