Merge pull request #8096 from onematchfox/virtualbox-snapshot

fix(virtualbox-vm) LoadSnapshots should succeed even if machine has no snapshots

builder/virtualbox/common/driver_4_2.go

@@ -252,17 +252,18 @@ func (d *VBox42Driver) LoadSnapshots(vmName string) (*VBoxSnapshot, error) {
 	}
 	log.Printf("Executing LoadSnapshots: VM: %s", vmName)
 
+	var rootNode *VBoxSnapshot
 	stdoutString, err := d.VBoxManageWithOutput("snapshot", vmName, "list", "--machinereadable")
+	if stdoutString == "This machine does not have any snapshots" {
+		return rootNode, nil
+	}
 	if nil != err {
 		return nil, err
 	}
 
-	var rootNode *VBoxSnapshot
+	rootNode, err = ParseSnapshotData(stdoutString)
-	if stdoutString != "This machine does not have any snapshots" {
+	if nil != err {
-		rootNode, err = ParseSnapshotData(stdoutString)
+		return nil, err
-		if nil != err {
-			return nil, err
-		}
 	}
 
 	return rootNode, nil