Francois Gouget : testbot/RevertVM: Fix a few error messages.

Alexandre Julliard julliard at wine.codeweavers.com
Mon Feb 29 06:50:02 CST 2016


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

Author: Francois Gouget <fgouget at free.fr>
Date:   Mon Feb 29 01:33:07 2016 +0100

testbot/RevertVM: Fix a few error messages.

Signed-off-by: Francois Gouget <fgouget at free.fr>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 testbot/bin/RevertVM.pl | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/testbot/bin/RevertVM.pl b/testbot/bin/RevertVM.pl
index e8e7a87..da43f22 100755
--- a/testbot/bin/RevertVM.pl
+++ b/testbot/bin/RevertVM.pl
@@ -59,7 +59,7 @@ sub Error(@)
 sub FatalError($$)
 {
   my ($ErrMessage, $VM) = @_;
-  Error "$Name0:error: $ErrMessage";
+  Error $ErrMessage;
 
   # Get the up-to-date VM status and update it if nobody else changed it
   my $VMKey = $VM->GetKey();
@@ -176,7 +176,7 @@ Debug(Elapsed($Start), " Reverting $VMKey to ", $VM->IdleSnapshot, "\n");
 $ErrMessage = $VM->RevertToSnapshot($VM->IdleSnapshot);
 if (defined($ErrMessage))
 {
-  FatalError "Can't revert $VMKey to " . $VM->IdleSnapshot . ": $ErrMessage",
+  FatalError "Could not revert $VMKey to " . $VM->IdleSnapshot . ": $ErrMessage\n",
              $VM;
 }
 
@@ -187,7 +187,7 @@ $VM->Status("sleeping");
 (my $ErrProperty, $ErrMessage) = $VM->Save();
 if (defined($ErrMessage))
 {
-  FatalError "Can't change status for VM $VMKey: $ErrMessage", $VM;
+  FatalError "Could not change status for VM $VMKey: $ErrMessage\n", $VM;
 }
 
 Debug(Elapsed($Start), " Trying the TestAgent connection\n");
@@ -199,7 +199,7 @@ $TA->Disconnect();
 if (!$Success)
 {
   $ErrMessage = $TA->GetLastError();
-  FatalError "Tools in $VMKey not responding: $ErrMessage", $VM;
+  FatalError "Tools in $VMKey not responding: $ErrMessage\n", $VM;
 }
 
 if ($SleepAfterRevert != 0)
@@ -218,7 +218,7 @@ $VM->ChildPid(undef);
 ($ErrProperty, $ErrMessage) = $VM->Save();
 if (defined($ErrMessage))
 {
-  FatalError "Can't change status for VM $VMKey: $ErrMessage", $VM;
+  FatalError "Could not change status for VM $VMKey: $ErrMessage\n", $VM;
 }
 
 LogMsg "Revert of $VMKey completed\n";




More information about the wine-cvs mailing list