From fd5a2db58fc7ca5977f6aeb7982817b8c5438809 Mon Sep 17 00:00:00 2001 From: Thomas Meckel <14177833+tmeckel@users.noreply.github.com> Date: Wed, 26 Jun 2019 16:06:20 +0200 Subject: [PATCH] Removed commented (obsolete) code from builder\virtualbox\common\driver_4_2.go --- builder/virtualbox/common/driver_4_2.go | 89 ------------------------- 1 file changed, 89 deletions(-) diff --git a/builder/virtualbox/common/driver_4_2.go b/builder/virtualbox/common/driver_4_2.go index 296ca5343..1cc3e4ff9 100644 --- a/builder/virtualbox/common/driver_4_2.go +++ b/builder/virtualbox/common/driver_4_2.go @@ -325,92 +325,3 @@ func (d *VBox42Driver) DeleteSnapshot(vmname string, sn *VBoxSnapshot) error { log.Printf("Executing DeleteSnapshot: VM: %s, SnapshotName %s", vmname, sn.UUID) return d.VBoxManage("snapshot", vmname, "delete", sn.UUID) } - -/* -func (d *VBox42Driver) SnapshotExists(vmname string, snapshotName string) (bool, error) { - log.Printf("Executing SnapshotExists: VM %s, SnapshotName %s", vmname, snapshotName) - - var stdout, stderr bytes.Buffer - - cmd := exec.Command(d.VBoxManagePath, "snapshot", vmname, "list", "--machinereadable") - cmd.Stdout = &stdout - cmd.Stderr = &stderr - err := cmd.Run() - - if _, ok := err.(*exec.ExitError); ok { - stderrString := strings.TrimSpace(stderr.String()) - return false, (fmt.Errorf("VBoxManage error: %s", stderrString)) - } - - SnapshotNameRe := regexp.MustCompile(fmt.Sprintf("SnapshotName[^=]*=[^\"]*\"%s\"", snapshotName)) - - for _, line := range strings.Split(stdout.String(), "\n") { - if SnapshotNameRe.MatchString(line) { - return true, nil - } - } - - return false, nil -} - -func (d *VBox42Driver) GetParentSnapshot(vmname string, snapshotName string) (string, error) { - log.Printf("Executing GetParentSnapshot: VM %s, SnapshotName %s", vmname, snapshotName) - - var stdout, stderr bytes.Buffer - - cmd := exec.Command(d.VBoxManagePath, "snapshot", vmname, "list", "--machinereadable") - cmd.Stdout = &stdout - cmd.Stderr = &stderr - err := cmd.Run() - - if _, ok := err.(*exec.ExitError); ok { - stderrString := strings.TrimSpace(stderr.String()) - return "", (fmt.Errorf("VBoxManage error: %s", stderrString)) - } - - SnapshotNameRe := regexp.MustCompile(fmt.Sprintf("SnapshotName[^=]*=[^\"]*\"%s\"", snapshotName)) - - var snapshot string - for _, line := range strings.Split(stdout.String(), "\n") { - if SnapshotNameRe.MatchString(line) { - snapshot = line - break - } - } - - if snapshot == "" { - return "", (fmt.Errorf("Snapshot %s does not exist", snapshotName)) - } - - SnapshotNamePartsRe := regexp.MustCompile("SnapshotName(?P(-[1-9]+)*)") - matches := SnapshotNamePartsRe.FindStringSubmatch(snapshot) - log.Printf("************ Snapshot %s name parts", snapshot) - log.Printf("Matches %#v\n", matches) - log.Printf("Node %s\n", matches[0]) - log.Printf("Path %s\n", matches[1]) - log.Printf("Leaf %s\n", matches[2]) - leaf := matches[2] - node := matches[0] - if node == "" { - return "", (fmt.Errorf("Unsupported format for snapshot %s", snapshot)) - } - if leaf != "" && node != "" { - SnapshotNodeRe := regexp.MustCompile("^(?PSnapshotName[^=]*)=[^\"]*\"(?P[^\"]+)\"") - parentNode := node[:len(node)-len(leaf)] - log.Printf("Parent node %s\n", parentNode) - var parentName string - for _, line := range strings.Split(stdout.String(), "\n") { - if matches := SnapshotNodeRe.FindStringSubmatch(line); len(matches) > 1 && parentNode == matches[1] { - parentName = matches[2] - log.Printf("Parent Snapshot name %s\n", parentName) - break - } - } - if parentName == "" { - return "", (fmt.Errorf("Internal error: Unable to find name for snapshot node %s", parentNode)) - } - return parentName, nil - } - return "", nil -} -*/