proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-07-19 23:36:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Jobs: include existing types in state file regex for deletion

Browse Source 
otherwise, we cannot correctly match types that contain a hyphen,
since the id itself can also contain those.

creating a regex where the first part is the concrete allowed
types followed by a hyphen + id can also match those.

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Dominik Csapak 2023-01-17 12:46:56 +01:00 committed by Thomas Lamprecht
parent 63d74bb632
commit a1c51a74ca
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
PVE/Jobs.pm
View File

@ -324,7 +324,10 @@ sub synchronize_job_states_with_config {
} }
} }
PVE::Tools::dir_glob_foreach($state_dir, '(.*?)-(.*).json', sub { my $valid_types = PVE::Job::Registry->lookup_types();
my $type_regex = join("|", $valid_types->@*);
PVE::Tools::dir_glob_foreach($state_dir, "(${type_regex})-(.*).json", sub {
my ($path, $type, $id) = @_; my ($path, $type, $id) = @_;
if (!defined($data->{ids}->{$id})) { if (!defined($data->{ids}->{$id})) {