[PATCH 1/3] testbot/WineRunWineTest: Ignore other errors if we get a badpatch error.

[Francois Gouget]

Just like finding a success line in the task log proves that it was
successful no matter what happened before, a 'badpatch' line
conclusively determines the task status.

Signed-off-by: Francois Gouget 
---

This is the same patch as yesterday but integrated into this series 
since they conflict if applied out of order.

testbot/bin/WineRunWineTest.pl | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl
index 0aba7ecfc..53a2a0929 100755
--- a/testbot/bin/WineRunWineTest.pl
+++ b/testbot/bin/WineRunWineTest.pl
@@ -356,8 +356,8 @@ if (!$Pid)

#
-# From that point on we want to at least try to grab the task
-# log before giving up
+# From that point on we want to at least try to grab the task log
+# before giving up
 #

my ($NewStatus, $ErrMessage, $TAError, $TaskTimedOut);
@@ -391,7 +391,9 @@ if ($TA->GetFile("Task.log", "$TaskDir/log"))
   }
   elsif ($Result eq "badpatch")
   {
+    # This too is conclusive enough to ignore other errors.
     $NewStatus = "badpatch";
+    $TAError = $ErrMessage = undef;
   }
   elsif ($Result =~ s/^nolog://)
   {