X-Git-Url: https://git.proxmox.com/?p=pve-common.git;a=blobdiff_plain;f=src%2FPVE%2FCLIFormatter.pm;h=84dbed1e6e2af6fbaf63c2e7d3631247f94bd664;hp=3040323eff0f480fe096fbdf1be2c196e80181b3;hb=c0b8717c443436d724f4e0be9cfce725d8123df0;hpb=fbd10e04e73ae319f1c59f37344a60e9d640fe9d diff --git a/src/PVE/CLIFormatter.pm b/src/PVE/CLIFormatter.pm index 3040323..84dbed1 100644 --- a/src/PVE/CLIFormatter.pm +++ b/src/PVE/CLIFormatter.pm @@ -2,12 +2,14 @@ package PVE::CLIFormatter; use strict; use warnings; + use I18N::Langinfo; use POSIX qw(strftime); use CPAN::Meta::YAML; # comes with perl-modules use PVE::JSONSchema; use PVE::PTY; + use JSON; use utf8; use Encode; @@ -356,7 +358,7 @@ sub extract_properties_to_print { # takes formatting information from the results property of the call # if $props_to_print is provided, prints only those columns. otherwise # takes all fields of the results property, with a fallback -# to all fields occuring in items of $data. +# to all fields occurring in items of $data. sub print_api_list { my ($data, $result_schema, $props_to_print, $options, $terminal_opts) = @_; @@ -411,6 +413,7 @@ sub print_api_result { if ($result_schema && defined($result_schema->{type})) { return if $result_schema->{type} eq 'null'; + return if $result_schema->{optional} && !defined($data); } else { my $type = $guess_type->($data); $result_schema = { type => $type };