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

fix sinv error processing defect 3524781

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@12565 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
lissav 2012-05-08 16:20:11 +00:00
parent 6484d0b141
commit f0b6fde5d9
1 changed files with 5 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
perl-xCAT/xCAT/SINV.pm
View File

@ -59,7 +59,7 @@ sub usage
my $usagemsg3 =
" -p <template path> [-o output file ] [-t <template count>]\n";
my $usagemsg4 = " [-r remove templates] [-s <seednode>]\n";
my $usagemsg5 = " [-e exactmatch] [-i ignore]\n";
my $usagemsg5 = " [-e exactmatch] [-i ignore] [-V verbose]\n";
my $usagemsg6 = " {-c <command> | -f <command file>}";
my $usagemsg .= $usagemsg1 .= $usagemsg1a .= $usagemsg3 .= $usagemsg4 .=
$usagemsg5 .= $usagemsg6;
@ -475,18 +475,6 @@ sub parse_and_run_sinv
},
\&$cmdoutput
);
if ($? > 0)
{
my $rsp = {};
my $i = 0;
foreach my $line (@cmdresult)
{
$rsp->{data}->[$i] = $line;
$i++;
}
xCAT::MsgUtils->message("E", $rsp, $callback);
return 1;
}
# write the results to the tempfile after running through xdshcoll
$rc = &storeresults($callback);
@ -517,18 +505,6 @@ sub parse_and_run_sinv
\&$cmdoutput
);
if ($? > 0)
{
my $rsp = {};
my $i = 0;
foreach my $line (@cmdresult)
{
$rsp->{data}->[$i] = $line;
$i++;
}
xCAT::MsgUtils->message("E", $rsp, $callback);
return 1;
}
# write the results to the tempfile after running through xdshcoll
$rc = &storeresults($callback);
@ -1166,6 +1142,7 @@ sub writereport
my $rsp = {};
$ignorefirsttemplate =~ tr/a-z/A-Z/; # convert to upper
my $firstpass = 0;
my @allnodearray=();
foreach my $template (sort keys %nodehash)
{
@ -1193,6 +1170,7 @@ sub writereport
{
my @shortnodename = split(/\./, $node);
push @nodearray, $shortnodename[0]; # add to process list
push @allnodearray, $shortnodename[0]; # add to total list
$nodelist .= $shortnodename[0]; # add to print list
$nodelist .= ',';
}
@ -1250,7 +1228,8 @@ sub writereport
my @shortnodename;
chomp $dshnodename;
$dshnodename =~ s/\s*//g; # remove blanks
foreach my $nodename (@nodearray)
#foreach my $nodename (@nodearray)
foreach my $nodename (@allnodearray)
{
@shortdshnodename = split(/\./, $dshnodename);
@shortnodename = split(/\./, $nodename);