arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix wvid output on missing key

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@8955 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso
2011-03-01 21:36:27 +00:00
parent 746eef7bd9
commit 54be730b76
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
xCAT-server/lib/xcat/plugins/ipmi.pm
View File

@@ -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>!argument>title=$currnode wvid</argument>!;