testbot: Don't hardcode the WineTestBot name.

[Francois Gouget]

---

One Marvin is all I can deal with ;-)

After applying this patch the $RobotEMail should be adjusted to include 
the 'user friendly' name of the WineTestBot (Marvin currently). This 
will also have the side-effect of standardizing on one format, 
preferably 'Name <email-address>'.


 testbot/bin/RevertVM.pl                        |    2 +-
 testbot/bin/WineSendLog.pl                     |    4 ++--
 testbot/lib/WineTestBot/ConfigLocalTemplate.pl |    8 ++++----
 testbot/lib/WineTestBot/Users.pm               |    4 ++--
 testbot/scripts/CheckWineTestBot.pl            |    2 +-
 testbot/web/Feedback.pl                        |    4 ++--
 testbot/web/Register.pl                        |    4 ++--
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/testbot/bin/RevertVM.pl b/testbot/bin/RevertVM.pl
index 7d3359e..f9edeb7 100755
--- a/testbot/bin/RevertVM.pl
+++ b/testbot/bin/RevertVM.pl
@@ -57,7 +57,7 @@ sub FatalError
     my $VMSnapshot = $VM->IdleSnapshot;
     open (SENDMAIL, "|/usr/sbin/sendmail -oi -t -odq");
     print SENDMAIL <<"EOF";
-From: <$RobotEMail> (Marvin)
+From: $RobotEMail
 To: $AdminEMail
 Subject: VM $VMKey offline
 
diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl
index 04e9009..515b6c8 100755
--- a/testbot/bin/WineSendLog.pl
+++ b/testbot/bin/WineSendLog.pl
@@ -190,7 +190,7 @@ sub SendLog
   my @SortedKeys = sort @{$StepsTasks->GetKeys()};
 
   open (SENDMAIL, "|/usr/sbin/sendmail -oi -t -odq");
-  print SENDMAIL "From: Marvin <$RobotEMail>\n";
+  print SENDMAIL "From: $RobotEMail\n";
   print SENDMAIL "To: $To\n";
   my $Subject = "TestBot job " . $Job->Id . " results";
   my $Description = $Job->GetDescription();
@@ -425,7 +425,7 @@ EOF
   if ($Messages)
   {
     open (SENDMAIL, "|/usr/sbin/sendmail -oi -t -odq");
-    print SENDMAIL "From: Marvin <$RobotEMail>\n";
+    print SENDMAIL "From: $RobotEMail\n";
     print SENDMAIL "To: $To\n";
     print SENDMAIL "Cc: $WinePatchCc\n";
     print SENDMAIL "Subject: Re: ", $Job->Patch->Subject, "\n";
diff --git a/testbot/lib/WineTestBot/ConfigLocalTemplate.pl b/testbot/lib/WineTestBot/ConfigLocalTemplate.pl
index 38e6a3a..544ac3e 100644
--- a/testbot/lib/WineTestBot/ConfigLocalTemplate.pl
+++ b/testbot/lib/WineTestBot/ConfigLocalTemplate.pl
@@ -31,10 +31,10 @@ $WineTestBot::Config::DbUsername = "winetestbot";
 # The password of the database account
 $WineTestBot::Config::DbPassword = "";
 
-# Email address of the WineTestBot administrator
+# Name and email address of the WineTestBot administrator
 $WineTestBot::Config::AdminEMail = undef;
 
-# From address of mails sent by WineTestBot to users
+# Name and address for the 'From' field of mails sent by WineTestBot
 $WineTestBot::Config::RobotEMail = undef;
 
 # If set, sends the results to the specified email address instead of the
@@ -42,8 +42,8 @@ $WineTestBot::Config::RobotEMail = undef;
 # can provide useful results to Wine developers.
 $WineTestBot::Config::WinePatchToOverride = $WineTestBot::Config::AdminEMail;
 
-# If set, CC the results to the specified email address, for instance the
-# wine-devel mailing list.
+# If set, CC the results to the specified name + email address, for instance
+# the wine-devel mailing list.
 $WineTestBot::Config::WinePatchCc = "";
 
 # Email address to send the results to for integration with the Wine Patches
diff --git a/testbot/lib/WineTestBot/Users.pm b/testbot/lib/WineTestBot/Users.pm
index 2e6eedc..54c07bf 100644
--- a/testbot/lib/WineTestBot/Users.pm
+++ b/testbot/lib/WineTestBot/Users.pm
@@ -149,7 +149,7 @@ sub Approve
   my $Recipient = $self->GetEMailRecipient();
   open (SENDMAIL, "|/usr/sbin/sendmail -oi -t -odq");
   print SENDMAIL <<"EOF";
-From: <$RobotEMail> (Marvin)
+From: $RobotEMail
 To: $Recipient
 Subject: winetestbot account request
 
@@ -189,7 +189,7 @@ sub SendResetCode
   my $Recipient = $self->GetEMailRecipient();
   open (SENDMAIL, "|/usr/sbin/sendmail -oi -t -odq");
   print SENDMAIL <<"EOF";
-From: <$RobotEMail> (Marvin)
+From: $RobotEMail
 To: $Recipient
 Subject: winetestbot account request
 
diff --git a/testbot/scripts/CheckWineTestBot.pl b/testbot/scripts/CheckWineTestBot.pl
index 6415dc3..5e8a053 100755
--- a/testbot/scripts/CheckWineTestBot.pl
+++ b/testbot/scripts/CheckWineTestBot.pl
@@ -49,7 +49,7 @@ if (! PingEngine())
   
   open (SENDMAIL, "|/usr/sbin/sendmail -oi -t -odq");
   print SENDMAIL <<"EOF";
-From: <$RobotEMail> (Marvin)
+From: $RobotEMail
 To: $AdminEMail
 Subject: WineTestBot engine died
 
diff --git a/testbot/web/Feedback.pl b/testbot/web/Feedback.pl
index 626a7f8..c266ce4 100644
--- a/testbot/web/Feedback.pl
+++ b/testbot/web/Feedback.pl
@@ -111,8 +111,8 @@ sub OnSend
 
   open (SENDMAIL, "|/usr/sbin/sendmail -oi -t -odq");
   print SENDMAIL <<"EOF";
-From: <$RobotEMail> (Marvin)
-To: <$AdminEMail>
+From: $RobotEMail
+To: $AdminEMail
 Subject: winetestbot feedback
 
 EOF
diff --git a/testbot/web/Register.pl b/testbot/web/Register.pl
index 6d8e7f4..766d363 100644
--- a/testbot/web/Register.pl
+++ b/testbot/web/Register.pl
@@ -116,8 +116,8 @@ sub OnSendRequest
 
   open (SENDMAIL, "|/usr/sbin/sendmail -oi -t -odq");
   print SENDMAIL <<"EOF";
-From: <$RobotEMail> (Marvin)
-To: <$AdminEMail>
+From: $RobotEMail
+To: $AdminEMail
 Subject: winetestbot account request
 
 $Msg
-- 
1.7.10.4