From db34a2548f63bd5eb0a40610395930c8d35c2f83 Mon Sep 17 00:00:00 2001
From: lissav <lissav@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Wed, 5 Dec 2012 15:42:51 +0000
Subject: [PATCH] Check for already installed error on updatenode -S

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@14561 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/lib/xcat/plugins/updatenode.pm | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/updatenode.pm b/xCAT-server/lib/xcat/plugins/updatenode.pm
index 7e7a77029..3dc588452 100644
--- a/xCAT-server/lib/xcat/plugins/updatenode.pm
+++ b/xCAT-server/lib/xcat/plugins/updatenode.pm
@@ -1679,6 +1679,7 @@ sub getdata2
     my $rsp;
     foreach my $type (keys %$response)
     {
+        my $alreadyinstalled=0;
         foreach my $output (@{$response->{$type}})
         {
             chomp($output);
@@ -1688,10 +1689,17 @@ sub getdata2
               my ($node,$info) = split (/:/, $output);
               push(@::SUCCESSFULLNODES,$node);
             }
+            # check for already installed, this is not an error
+            if($output =~ /^\s*(\S+)\s*:\s*already installed/)
+            {
+              $alreadyinstalled = 1; 
+            }
             if($output =~ /^\s*(\S+)\s*:\s*Remote_command_failed/)
             {
-              my ($node,$info) = split (/:/, $output);
-              push(@::FAILEDNODES,$node);
+              if ($alreadyinstalled == 0) { # not an already install error 
+                my ($node,$info) = split (/:/, $output);
+                push(@::FAILEDNODES,$node);
+              } 
             }