From 54be730b760cfdc08a21ac007c366a80f425171b Mon Sep 17 00:00:00 2001 From: jbjohnso Date: Tue, 1 Mar 2011 21:36:27 +0000 Subject: [PATCH] Fix wvid output on missing key git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@8955 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/lib/xcat/plugins/ipmi.pm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/xCAT-server/lib/xcat/plugins/ipmi.pm b/xCAT-server/lib/xcat/plugins/ipmi.pm index aa97f4756..b39c894ae 100644 --- a/xCAT-server/lib/xcat/plugins/ipmi.pm +++ b/xCAT-server/lib/xcat/plugins/ipmi.pm @@ -1076,7 +1076,7 @@ sub getrvidparms_with_buildid { if ($response->content =~ /^ok:?(.*)/) { $sessionid=$1; } else { - sendmsg ([1,"Server returned unexpected data"],$callback,$sessdata->{node},%allerrornodes); + xCAT::SvrUtils::sendmsg ([1,"Server returned unexpected data"],$callback,$sessdata->{node},%allerrornodes); return; } @@ -1088,7 +1088,8 @@ sub getrvidparms_with_buildid { } my $jnlp = $response->content; if ($jnlp =~ /This advanced option requires the purchase and installation/) { - sendmsg ([1,"Node does not have feature key for remote video"],$sessdata->{node},%allerrornodes); + xCAT::SvrUtils::sendmsg ([1,"Node does not have feature key for remote video"],$callback,$sessdata->{node},%allerrornodes); + return; } my $currnode = $sessdata->{node}; $jnlp =~ s!argument>title=.*Video Viewer!argument>title=$currnode wvid!;