From 7f5e911c2a0a5ccabf104c543ae7d3c7729e1c8b Mon Sep 17 00:00:00 2001 From: jbjohnso Date: Wed, 21 Nov 2012 19:58:50 +0000 Subject: [PATCH] Fix slpdiscover error output git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.7@14388 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/lib/xcat/plugins/slpdiscover.pm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/xCAT-server/lib/xcat/plugins/slpdiscover.pm b/xCAT-server/lib/xcat/plugins/slpdiscover.pm index ed43e2bc1..e5e2ca588 100644 --- a/xCAT-server/lib/xcat/plugins/slpdiscover.pm +++ b/xCAT-server/lib/xcat/plugins/slpdiscover.pm @@ -346,7 +346,14 @@ sub do_blade_setup { sendmsg([1,"Failed to set up Management module due to Incorrect Password (You may try the environment variables XCAT_CURRENTUSER and/or XCAT_CURRENTPASS to try a different value)"],$callback,$nodename); return 0; } - sendmsg([$result->[0],$result->[2]],$callback,$nodename); + my $errors = $result->[2]; + if (ref $errors) { + foreach my $error (@$errors) { + sendmsg([$result->[0],$error],$callback,$nodename); + } + } else { + sendmsg([$result->[0],$result->[2]],$callback,$nodename); + } return 0; } }