Signed-off-by: Fabian Ebner <f.eb...@proxmox.com> --- Dependency bump for pve-common is needed.
PVE/API2/Tasks.pm | 5 ++++- PVE/CLI/pvenode.pm | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/PVE/API2/Tasks.pm b/PVE/API2/Tasks.pm index 8f6ab603..abae8ba3 100644 --- a/PVE/API2/Tasks.pm +++ b/PVE/API2/Tasks.pm @@ -142,7 +142,10 @@ __PACKAGE__->register_method({ return 1 if $typefilter && $task->{type} ne $typefilter; - return 1 if $errors && $task->{status} && $task->{status} eq 'OK'; + if ($errors && $task->{status} && !PVE::Tools::upid_status_is_error($task->{status})) { + return 1; + } + return 1 if $param->{vmid} && (!$task->{id} || $task->{id} ne $param->{vmid}); return 1 if $count++ < $start; diff --git a/PVE/CLI/pvenode.pm b/PVE/CLI/pvenode.pm index a33fcd93..b05b3e15 100644 --- a/PVE/CLI/pvenode.pm +++ b/PVE/CLI/pvenode.pm @@ -181,7 +181,10 @@ our $cmddef = { foreach my $task (@$data) { if (!defined($task->{status})) { $task->{status} = 'UNKNOWN'; - } elsif ($task->{status} ne 'OK' && $task->{status} ne 'RUNNING') { + # RUNNING is set by the API call and needs to be checked explicitly + } elsif (PVE::Tools::upid_status_is_error($task->{status}) && + $task->{status} ne 'RUNNING') + { $task->{status} = 'ERROR'; } } -- 2.20.1 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel