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