arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix runxcmd, if refoutput=2 ( noparsing of the returned data, will not display output

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@14302 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
lissav 2012-11-10 12:06:39 +00:00
parent 92969c95e6
commit 42e7811d54
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
perl-xCAT/xCAT/Utils.pm
View File

@ -1068,9 +1068,12 @@ sub runcmd
reference to xCAT daemon sub_req routine
exitcode
exitcode - see definitions below
reference to output
refoutput - type of output to build
Not set - array
1 - reference to an array
2 - returns the response hash as received from the plugin.
Returns:
@ -1083,7 +1086,7 @@ sub runcmd
Normally, if there is an error running the cmd,it will display the
error and exit with the cmds exit code, unless exitcode
is given one of the following values:
0: display error msg, DO NOT exit on error, but set
0: display error msg, DO NOT exit on error, but set
$::RUNCMD_RC to the exit code.
-1: DO NOT display error msg and DO NOT exit on error, but set
$::RUNCMD_RC to the exit code.
@ -1095,15 +1098,18 @@ sub runcmd
return output as reference to an array
my $outref = xCAT::Utils->runxcmd($cmd,$sub_req, -2, 1);
return response hash from plugin
my $outref = xCAT::Utils->runxcmd($cmd,$sub_req, -2, 2);
return response hash from plugin . Will not display error msg for any
exit_code setting.
my $outref = xCAT::Utils->runxcmd($cmd,$sub_req, -1, 2);
Comments:
If refoutput is 1, then the output will be returned as a
reference to an array for efficiency.
If refoutput is 2, then the response hash will be returned
as output. runxcmd will not parse the request structure.
as output. runxcmd will not parse the request structure, nor
will it display the error message despite the exit_code setting.
The caller will need to display the error.
Do not use the scalar string input for xdsh unless you are running
a simple single-word command. When building your request hash,
@ -1198,6 +1204,14 @@ sub runxcmd
if ($::RUNCMD_RC)
{
my $displayerror = 1;
# Do not display error for refoutput=2
# we do not parse the returned structure
if (defined ($refoutput)) {
if ($refoutput == 2) {
$displayerror = 0;
}
}
my $rc;
if (defined($exitcode) && length($exitcode) && $exitcode != -2)
{
@ -1208,6 +1222,7 @@ sub runxcmd
elsif ($exitcode <= 0)
{
$rc = ''; # if zero or negative, do not exit
if ($exitcode < 0) { $displayerror = 0; }
}
}
@ -1215,6 +1230,7 @@ sub runxcmd
{
$rc = $::RUNCMD_RC;
} # if exitcode not specified, use cmd exit code
if ($displayerror)
{
my $rsp = {};