From f0b6fde5d9fa1082ec85251ddebe7af8e37030c3 Mon Sep 17 00:00:00 2001
From: lissav <lissav@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Tue, 8 May 2012 16:20:11 +0000
Subject: [PATCH] fix sinv error processing defect 3524781

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@12565 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 perl-xCAT/xCAT/SINV.pm | 31 +++++--------------------------
 1 file changed, 5 insertions(+), 26 deletions(-)

diff --git a/perl-xCAT/xCAT/SINV.pm b/perl-xCAT/xCAT/SINV.pm
index a7a4fc398..d371e4c59 100644
--- a/perl-xCAT/xCAT/SINV.pm
+++ b/perl-xCAT/xCAT/SINV.pm
@@ -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);