From a36d004f836fb49beb2cecf8e4d882b0b3afe63c Mon Sep 17 00:00:00 2001 From: lissav Date: Tue, 24 Jun 2014 07:38:55 -0400 Subject: [PATCH] Defect 4164, change rinstall to a plugin --- perl-xCAT/xCAT/Utils.pm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/perl-xCAT/xCAT/Utils.pm b/perl-xCAT/xCAT/Utils.pm index 55bb47354..c37fdb410 100644 --- a/perl-xCAT/xCAT/Utils.pm +++ b/perl-xCAT/xCAT/Utils.pm @@ -1370,11 +1370,30 @@ sub runxcmd_output } } } + if (defined($node->{error})) + { + if (ref(\($node->{error}->[0])) eq 'SCALAR') + { + $desc = $desc . ": " . $node->{error}->[0]; + } + } + if (defined($node->{errorcode})) + { + if (ref(\($node->{errorcode}->[0])) eq 'SCALAR') + { + $::RUNCMD_RC |= $node->{errorcode}->[0]; + } + } push @$::xcmd_outref, $desc; } if (defined($resp->{error})) { + if (ref($resp->{error}) eq 'ARRAY') + { push @$::xcmd_outref, @{$resp->{error}}; + } else { + push @$::xcmd_outref, $resp->{error}; + } } if (defined($resp->{errorcode})) {