From 9e458341d77fdddd512127dfb7199b41e9428857 Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Fri, 17 Sep 2010 14:36:27 +0000
Subject: [PATCH] -Fix oversight in unit allowance in previous checkin

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7500 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/lib/xcat/plugins/esx.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/esx.pm b/xCAT-server/lib/xcat/plugins/esx.pm
index 61e94c9a5..480eff208 100644
--- a/xCAT-server/lib/xcat/plugins/esx.pm
+++ b/xCAT-server/lib/xcat/plugins/esx.pm
@@ -2155,12 +2155,12 @@ sub build_cfgspec {
     my $ncpus;
     my $updatehash;
     if ($otherargs->{memory}) {
-        $memory=$otherargs->{memory};
+        $memory=getUnits($otherargs->{memory},"M",1048576);
         if ($tablecfg{vm}->{$node}->[0]->{memory}) {
             $updatehash->{memory}=$memory;
         }
     } elsif ($tablecfg{vm}->{$node}->[0]->{memory}) {
-        $memory = getUnits($tablecfg{vm}->{$node}->[0]->{memory},"M",1048576) 
+        $memory = getUnits($tablecfg{vm}->{$node}->[0]->{memory},"M",1048576);
     } else {
         $memory = 512;
     }
@@ -3061,7 +3061,7 @@ sub build_more_info{
     if (defined($ent->{mpa})) { push @{$mpa_hash{$ent->{mpa}}{nodes}}, $node;}
     else {
       $callback->({data=>["no mpa defined for node $node"]});
-      return @moreinfo;;
+      return @moreinfo;
     }
     if (defined($ent->{id})) { push @{$mpa_hash{$ent->{mpa}}{ids}}, $ent->{id};}
     else { push @{$mpa_hash{$ent->{mpa}}{ids}}, "";}