From 61b359fb11397805eff1fa26cafa59982594883c Mon Sep 17 00:00:00 2001 From: John Simpson Date: Fri, 8 Nov 2013 09:27:11 -0500 Subject: [PATCH] updated messages in ipmi.pm to correct double colon problem with IBM::EnergyManager in the string --- xCAT-server/lib/xcat/plugins/ipmi.pm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/xCAT-server/lib/xcat/plugins/ipmi.pm b/xCAT-server/lib/xcat/plugins/ipmi.pm index 6dcc82e4a..257c78f2c 100644 --- a/xCAT-server/lib/xcat/plugins/ipmi.pm +++ b/xCAT-server/lib/xcat/plugins/ipmi.pm @@ -4479,7 +4479,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; @@ -4854,7 +4854,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=(); @@ -5036,7 +5036,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(); @@ -6336,7 +6336,6 @@ sub preprocess_request { return 0; } } - if (!$realnoderange) { $usage_string=xCAT::Usage->getUsage($command); $callback->({data=>$usage_string});