Francois Gouget : testbot/lib: Simplify Jobs::ScheduleOnHost() a bit.

[Alexandre Julliard]

Module: tools
Branch: master
Commit: e9d494a87824255b00ecdc923838ad80eb3410cd
URL:    http://source.winehq.org/git/tools.git/?a=commit;h=e9d494a87824255b00ecdc923...

Author: Francois Gouget <fgouget(a)codeweavers.com>
Date:   Tue Jan 22 04:10:41 2013 +0100

testbot/lib: Simplify Jobs::ScheduleOnHost() a bit.

---

 testbot/lib/WineTestBot/Jobs.pm |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm
index c15c7af..269643d 100644
--- a/testbot/lib/WineTestBot/Jobs.pm
+++ b/testbot/lib/WineTestBot/Jobs.pm
@@ -388,16 +388,16 @@ sub ScheduleOnHost($$)
       my @SortedTasks = sort CompareTaskStatus @{$Tasks->GetItems()};
       foreach my $Task (@SortedTasks)
       {
-        if ($Task->Status eq "queued" &&
-            $HostVMs->ItemExists($Task->VM->GetKey()))
+        my $VM = $Task->VM;
+        my $VMKey = $VM->GetKey();
+        if ($Task->Status eq "queued" && $HostVMs->ItemExists($VMKey))
         {
-          my $VM = $HostVMs->GetItem($Task->VM->GetKey());
           if ($VM->Status eq "idle" &&
               $RunningVMs < $MaxRunningVMs &&
               $RevertingVMs == 0)
           {
             $VM->Status("running");
-            my ($ErrProperty, $ErrMessage) = $HostVMs->Save();
+            my ($ErrProperty, $ErrMessage) = $VM->Save();
             if (defined($ErrMessage))
             {
               return $ErrMessage;
@@ -407,12 +407,11 @@ sub ScheduleOnHost($$)
             {
               return $ErrMessage;
             }
-            $Job->UpdateStatus;
+            $Job->UpdateStatus();
             $RunningVMs++;
           }
           elsif ($VM->Status eq "dirty")
           {
-            my $VMKey = $VM->GetKey();
             if (! defined($DirtyVMsBlockingJobs{$VMKey}) ||
                 $Job->Priority < $DirtyVMsBlockingJobs{$VMKey})
             {