Merge pull request #8096 from onematchfox/virtualbox-snapshot

fix(virtualbox-vm) LoadSnapshots should succeed even if machine has no snapshots
pull/8099/head
Adrien Delorme 7 years ago committed by GitHub
commit 2e58b807de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -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
if stdoutString != "This machine does not have any snapshots" {
rootNode, err = ParseSnapshotData(stdoutString)
if nil != err {
return nil, err
}
rootNode, err = ParseSnapshotData(stdoutString)
if nil != err {
return nil, err
}
return rootNode, nil

Loading…
Cancel
Save