From 723623e8850f0f78cfce6d0c123c68b621184a71 Mon Sep 17 00:00:00 2001 From: Wolfgang Link Date: Wed, 18 Mar 2020 07:51:12 +0100 Subject: [PATCH] fix: check for incremental sync snapshot. For an incremental sync you need the last_snap on both sides. --- pve-zsync | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pve-zsync b/pve-zsync index 25add92..347866a 100755 --- a/pve-zsync +++ b/pve-zsync @@ -933,6 +933,7 @@ sub snapshot_destroy { } } +# check if snapshot for incremental sync exist on dest side sub snapshot_exist { my ($source , $dest, $method, $dest_user) = @_; @@ -942,22 +943,16 @@ sub snapshot_exist { my $path = $dest->{all}; $path .= "/$source->{last_part}" if $source->{last_part}; - $path .= "\@$source->{old_snap}"; + $path .= "\@$source->{last_snap}"; push @$cmd, $path; - - my $text = ""; - eval {$text =run_cmd($cmd);}; + eval {run_cmd($cmd)}; if (my $erro =$@) { warn "WARN: $erro"; return undef; } - - while ($text && $text =~ s/^(.*?)(\n|$)//) { - my $line =$1; - return 1 if $line =~ m/^.*$source->{old_snap}$/; - } + return 1; } sub send_image { -- 2.39.2