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

updated messages in ipmi.pm to correct double colon problem with IBM::EnergyManager in the string

Browse Source
This commit is contained in:
John Simpson 2013-11-08 09:27:11 -05:00
parent 3bd9fbc891
commit d3894733bd
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4542,7 +4542,7 @@ sub ieminitted {
sub readenergy {
my $sessdata = shift;
unless ($iem_support) {
xCAT::SvrUtils::sendmsg([1,"IBM::EnergyManager package required for this value"],$callback,$sessdata->{node},%allerrornodes);
xCAT::SvrUtils::sendmsg([1,":IBM::EnergyManager package required for this value"],$callback,$sessdata->{node},%allerrornodes);
return;
}
my @entries;
@ -4917,7 +4917,7 @@ sub renergy {
my $sessdata = shift;
my @subcommands = @{$sessdata->{extraargs}};
unless ($iem_support) {
xCAT::SvrUtils::sendmsg("Command unsupported without IBM::EnergyManager installed",$callback,$sessdata->{node});
xCAT::SvrUtils::sendmsg(":Command unsupported without IBM::EnergyManager installed",$callback,$sessdata->{node});
return;
}
my @directives=();
@ -5099,7 +5099,7 @@ sub vitals {
if ($iem_support) {
push @{$sessdata->{sensorstoread}},"energy";
} elsif (not $doall) {
xCAT::SvrUtils::sendmsg([1,"Energy data requires additional IBM::EnergyManager plugin in conjunction with IMM managed IBM equipment"],$callback,$sessdata->{node},%allerrornodes);
xCAT::SvrUtils::sendmsg([1,":Energy data requires additional IBM::EnergyManager plugin in conjunction with IMM managed IBM equipment"],$callback,$sessdata->{node},%allerrornodes);
}
#my @energies;
#($rc,@energies)=readenergy();
@ -6399,7 +6399,6 @@ sub preprocess_request {
return 0;
}
}
if (!$realnoderange) {
$usage_string=xCAT::Usage->getUsage($command);
$callback->({data=>$usage_string});