From f94f9b9f71030d3c848597fcda93457f9f1b65a7 Mon Sep 17 00:00:00 2001 From: shoopea Date: Thu, 29 Jun 2023 23:42:46 +0200 Subject: [PATCH] transfer blocked by wrong comparison --- box.go | 2 +- version.go | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/box.go b/box.go index 7948c67..743f48d 100644 --- a/box.go +++ b/box.go @@ -188,7 +188,7 @@ func TransferZfs(from, to Addr) error { return err } - if fromSnapshots[fromFromSnapshotId].name != lastToSnapshot.name { + if fromFromSnapshotId < len(fromSnapshots)-1 { log.WithFields(log.Fields{"from": from, "to": to}).Debugf("transfering from %s to %s", fromSnapshots[fromFromSnapshotId].name, fromSnapshots[len(fromSnapshots)-1].name) if _, err := to.BoxExec("ssh " + from.Box() + " zfs send -I " + fromSnapshots[fromFromSnapshotId].String() + " " + fromSnapshots[len(fromSnapshots)-1].String() + " | zfs recv -F " + to.Path()); err != nil { diff --git a/version.go b/version.go index f8456ff..0b12668 100644 --- a/version.go +++ b/version.go @@ -1,7 +1,7 @@ // Code generated by version.sh (@generated) DO NOT EDIT. package main -var githash = "3c785de" +var githash = "0e0e5db" var branch = "v2" -var buildstamp = "2023-06-29_21:24:17" -var commits = "58" -var version = "3c785de-b58 - 2023-06-29_21:24:17" +var buildstamp = "2023-06-29_21:36:34" +var commits = "59" +var version = "0e0e5db-b59 - 2023-06-29_21:36:34"