From 81ec3ad9293543739e8456f5f84e8749a8925cbc Mon Sep 17 00:00:00 2001
From: lissav <lissav@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Thu, 30 May 2013 11:47:00 +0000
Subject: [PATCH] get rid of duplicate messages on updatenode -k

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.8@16477 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/lib/xcat/plugins/updatenode.pm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/updatenode.pm b/xCAT-server/lib/xcat/plugins/updatenode.pm
index 1130a70d8..cd513b882 100644
--- a/xCAT-server/lib/xcat/plugins/updatenode.pm
+++ b/xCAT-server/lib/xcat/plugins/updatenode.pm
@@ -984,8 +984,8 @@ sub updatenode
             $::attrres{$attr} = $value;
         }
     }
-    # if not just using the -k flag, then set all nodes to syncing for the
-    # other updatenode options
+    # if not just using the -k flag, then set all nodes to syncing in 
+    # nodelist updatestatus  for the other updatenode options
     if (!($::SECURITY)) {
      my $stat="syncing";
      xCAT::TableUtils->setUpdateStatus(\@$nodes, $stat);
@@ -1697,10 +1697,11 @@ sub getdata
                 {
                     push @{$rsp->{$type}}, "$output";
                 }
-            }
-            if (($output !~ (/Error loading module/)) && ($output !~ /^\s*(\S+)\s*:\s*Remote_command_successful/) && ($output !~ /^\s*(\S+)\s*:\s*Remote_command_failed/))
-            {
+            } else{  # for non -k option then get the rest of the output
+              if (($output !~ (/Error loading module/)) && ($output !~ /^\s*(\S+)\s*:\s*Remote_command_successful/) && ($output !~ /^\s*(\S+)\s*:\s*Remote_command_failed/))
+              {
                 push @{$rsp->{$type}}, "$output";
+              }
             }
         }
     }