From 09a7eecc6d26a17fc3bd1318aa37f59a7d98f4b2 Mon Sep 17 00:00:00 2001
From: nott <nott@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Fri, 18 May 2012 02:20:59 +0000
Subject: [PATCH] merge oops

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

diff --git a/xCAT-server/lib/xcat/plugins/snmove.pm b/xCAT-server/lib/xcat/plugins/snmove.pm
index e12a32fc4..475ac203b 100644
--- a/xCAT-server/lib/xcat/plugins/snmove.pm
+++ b/xCAT-server/lib/xcat/plugins/snmove.pm
@@ -1030,14 +1030,15 @@ sub process_request
                                        },
                                        $sub_req, 0, 1
                                        );
-		my $rsp;
-		$rsp->{data}=$ret;
-                xCAT::MsgUtils->message("I", $rsp, $callback);
-                if ($::RUNCMD_RC != 0)
-                {
-                    $error++;
-                }
-            }
+
+				if ($::RUNCMD_RC != 0)
+				{
+					my $rsp;
+					push @{$rsp->{data}}, "Could not run the nodeset command.\n";
+					xCAT::MsgUtils->message("E", $rsp, $callback);
+					$error++;
+				}
+			}
         }
     }    # end - for Linux system only