yesBad/pve-storage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

esxi: use listvms.py's stderr as error message

Browse Source 
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller
2024-03-22 11:06:56 +01:00
parent 688cc11a29
commit 06a28968d8
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/PVE/Storage/ESXiPlugin.pm
View File

@ -140,10 +140,18 @@ sub get_manifest : prototype($$$;$) {
my $user = $scfg->{username}; my $user = $scfg->{username};
my $pwfile = esxi_cred_file_name($storeid); my $pwfile = esxi_cred_file_name($storeid);
my $json = ''; my $json = '';
run_command( my $errmsg = '';
[$ESXI_LIST_VMS, @extra_params, $host, $user, $pwfile], eval {
outfunc => sub { $json .= $_[0] . "\n" }, run_command(
); [$ESXI_LIST_VMS, @extra_params, $host, $user, $pwfile],
outfunc => sub { $json .= $_[0] . "\n" },
errfunc => sub { $errmsg .= $_[0] . "\n" },
);
};
if ($@) {
# propagate listvms error output if any, otherwise use the error from run_command
die $errmsg || $@;
}
my $result = PVE::Storage::ESXiPlugin::Manifest->new($json); my $result = PVE::Storage::ESXiPlugin::Manifest->new($json);
mkpath($rundir); mkpath($rundir);