From edb92f707a2f966fbcccbf364fdcb3dd50d8c64c Mon Sep 17 00:00:00 2001 From: Fabian Ebner Date: Wed, 7 Apr 2021 12:25:36 +0200 Subject: [PATCH] plugin: subdir files: backup: don't match for vmid against the full path Only match against the file name to avoid false positives with directory names containing "-$vmid-". Found while trying to debug/reproduce a forum thread[0], but the path there should not be affected by this... [0]: https://forum.proxmox.com/threads/vzdump-removing-too-many-backups.87072/ Signed-off-by: Fabian Ebner --- PVE/Storage/Plugin.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/PVE/Storage/Plugin.pm b/PVE/Storage/Plugin.pm index d2d8184..05f1701 100644 --- a/PVE/Storage/Plugin.pm +++ b/PVE/Storage/Plugin.pm @@ -1034,11 +1034,13 @@ my $get_subdir_files = sub { $info = { volid => "$sid:vztmpl/$1", format => "t$2" }; } elsif ($tt eq 'backup') { - next if defined($vmid) && $fn !~ m/\S+-$vmid-\S+/; next if $fn !~ m!/([^/]+\.(tgz|(?:(?:tar|vma)(?:\.(${\COMPRESSOR_RE}))?)))$!; my $original = $fn; my $format = $2; $fn = $1; + + next if defined($vmid) && $fn !~ m/\S+-$vmid-\S+/; + $info = { volid => "$sid:backup/$fn", format => $format }; my $archive_info = eval { PVE::Storage::archive_info($fn) } // {}; -- 2.39.5