testbot/bin: Make the wine-patches script names more descriptive and consistent.

Francois Gouget fgouget at codeweavers.com
Fri Oct 5 04:15:58 CDT 2012


Prefix them with 'WinePatches' in reference to both the Wine project and the wine-patches they relate to.
The 'WinePatchesML' script deals directly with the wine-patches Mailing List . The Submit script submits the patch directly.
The 'WinePatchesWeb' scripts deal with Wine's Patch web site. Specifically the Notify script informs the WineTestBot when new patches are available and the Get script grabs and submits them for testing.
---
 testbot/bin/Engine.pl                    |   32 +++++-----
 testbot/bin/PatchNotificationHandler.pl  |   48 --------------
 testbot/bin/RetrievePatches.pl           |  102 ------------------------------
 testbot/bin/WinePatchesHandler.pl        |   49 --------------
 testbot/bin/WinePatchesMLSubmit.pl       |   49 ++++++++++++++
 testbot/bin/WinePatchesWebGet.pl         |  102 ++++++++++++++++++++++++++++++
 testbot/bin/WinePatchesWebNotify.pl      |   48 ++++++++++++++
 testbot/doc/INSTALL.txt                  |   16 ++---
 testbot/lib/WineTestBot/Engine/Notify.pm |   16 ++---
 9 files changed, 231 insertions(+), 231 deletions(-)
 delete mode 100755 testbot/bin/PatchNotificationHandler.pl
 delete mode 100755 testbot/bin/RetrievePatches.pl
 delete mode 100755 testbot/bin/WinePatchesHandler.pl
 create mode 100755 testbot/bin/WinePatchesMLSubmit.pl
 create mode 100755 testbot/bin/WinePatchesWebGet.pl
 create mode 100755 testbot/bin/WinePatchesWebNotify.pl

diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl
index dfd4923..29dd2f7 100755
--- a/testbot/bin/Engine.pl
+++ b/testbot/bin/Engine.pl
@@ -277,7 +277,7 @@ sub HandleFoundWinetestUpdate
   return "1OK";
 }
 
-sub HandleNewWinePatchesSubmission
+sub HandleWinePatchMLSubmission
 {
   # Validate file name
   if ($_[0] !~ m/([0-9a-fA-F]{32}_wine-patches)/)
@@ -307,7 +307,7 @@ sub HandleNewWinePatchesSubmission
   return "1OK";
 }
 
-sub HandlePatchNotification
+sub HandleWinePatchWebNotification
 {
   # Validate file name
   if ($_[0] !~ m/([0-9a-fA-F]{32}_patchnotification)/)
@@ -353,24 +353,24 @@ sub HandlePatchNotification
     my $Pid = fork;
     if (defined($Pid) && ! $Pid)
     {
-      exec("$BinDir/RetrievePatches.pl " . ($MaxExistingPatchId + 1) . " " .
+      exec("$BinDir/WinePatchesWebGet.pl " . ($MaxExistingPatchId + 1) . " " .
            $LatestPatchId);
     }
     if (defined($Pid) && ! $Pid)
     {
-      LogMsg "Engine: Unable to exec RetrievePatches.pl : $!\n";
+      LogMsg "Engine: Unable to exec WinePatchesWebGet.pl : $!\n";
       exit;
     }
     if (! defined($Pid))
     {
-      LogMsg "Engine: Unable to fork for RetrievePatches.pl : $!\n";
+      LogMsg "Engine: Unable to fork for WinePatchesWebGet.pl : $!\n";
     }
   }
 
   return "1OK";
 }
 
-sub HandlePatchRetrieved
+sub HandleWinePatchWebSubmission
 {
   # Validate file name
   if ($_[0] !~ m/([0-9a-fA-F]{32}_patch_\d+)/)
@@ -474,17 +474,17 @@ sub HandleClientCmd
   {
     return HandleFoundWinetestUpdate(@_);
   }
-  if ($Cmd eq "newwinepatchessubmission")
+  if ($Cmd eq "winepatchmlsubmission")
   {
-    return HandleNewWinePatchesSubmission(@_);
+    return HandleWinePatchMLSubmission(@_);
   }
-  if ($Cmd eq "patchnotification")
+  if ($Cmd eq "winepatchwebnotification")
   {
-    return HandlePatchNotification(@_);
+    return HandleWinePatchWebNotification(@_);
   }
-  if ($Cmd eq "patchretrieved")
+  if ($Cmd eq "winepatchwebsubmission")
   {
-    return HandlePatchRetrieved(@_);
+    return HandleWinePatchWebSubmission(@_);
   }
   if ($Cmd eq "getscreenshot")
   {
@@ -538,8 +538,8 @@ This is called on startup and regularly after that to catch thing that fall
 through the cracks, possibly because of an Engine restart.
 Specifically it updates the status of all the current Jobs, Steps and
 Tasks, then schedules Tasks to be run, checks the staging directory for
-wine-patches emails dropped by WinePatchesHandler.pl, for notifications of
-changes on Wine's Patches web site dropped by PatchNotificationHandler.pl, and
+wine-patches emails dropped by WinePatchesMLSubmit.pl, for notifications of
+changes on Wine's Patches web site dropped by WinePatchesWebNotify.pl, and
 checks whether any pending patchsets are now complete and thus can be scheduled.
 
 =back
@@ -561,11 +561,11 @@ sub SafetyNet
     {
       if ($DirEntry =~ m/[0-9a-fA-F]{32}_wine-patches/)
       {
-        HandleNewWinePatchesSubmission($DirEntry);
+        HandleWinePatchMLSubmission($DirEntry);
       }
       elsif ($DirEntry =~ m/[0-9a-fA-F]{32}_patchnotification/)
       {
-        HandlePatchNotification($DirEntry);
+        HandleWinePatchWebNotification($DirEntry);
       }
     }
   }
diff --git a/testbot/bin/PatchNotificationHandler.pl b/testbot/bin/PatchNotificationHandler.pl
deleted file mode 100755
index 81cd376..0000000
--- a/testbot/bin/PatchNotificationHandler.pl
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# Notifies WineTestBot that there are new patches to test on
-# http://source.winehq.org/patches.
-#
-# Copyright 2009 Ge van Geldorp
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-
-use strict;
-
-my $Dir;
-sub BEGIN
-{
-  $0 =~ m=^(.*)/[^/]*$=;
-  $Dir = $1;
-}
-use lib "$Dir/../lib";
-
-use File::Copy;
-use WineTestBot::Config;
-use WineTestBot::Utils;
-use WineTestBot::Engine::Notify;
-
-# Store the message in the staging dir
-my $FileNameRandomPart = GenerateRandomString(32);
-while (-e ("$DataDir/staging/${FileNameRandomPart}_patchnotification"))
-{
-  $FileNameRandomPart = GenerateRandomString(32);
-}
-copy(\*STDIN, "$DataDir/staging/${FileNameRandomPart}_patchnotification");
-
-# Let the engine handle it
-PatchNotification("${FileNameRandomPart}_patchnotification");
-
-exit 0;
diff --git a/testbot/bin/RetrievePatches.pl b/testbot/bin/RetrievePatches.pl
deleted file mode 100755
index 18b3aa7..0000000
--- a/testbot/bin/RetrievePatches.pl
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# Retrieve the latest patches from http://source.winehq.org/patches and submit
-# them for testing. See also PatchNotificationHandler.pl.
-#
-# Copyright 2009 Ge van Geldorp
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-
-use strict;
-
-my $Dir;
-sub BEGIN
-{
-  $0 =~ m=^(.*)/[^/]*$=;
-  $Dir = $1;
-}
-use lib "$Dir/../lib";
-
-use LWP::UserAgent;
-use HTTP::Request;
-use HTTP::Response;
-use HTTP::Status;
-use WineTestBot::Config;
-use WineTestBot::Log;
-use WineTestBot::Utils;
-use WineTestBot::Engine::Notify;
-
-my ($StartPatchId, $EndPatchId) = @ARGV;
-if (! $StartPatchId || ! $EndPatchId)
-{
-  die "Usage: RetrievePatches.pl <StartPatchId> <EndPatchId>";
-}
-
-if ($StartPatchId =~ m/^(\d+)$/)
-{
-  $StartPatchId = $1;
-}
-else
-{
-  die "RetrievePatches: Invalid StartPatchId $StartPatchId";
-}
-if ($EndPatchId =~ m/^(\d+)$/)
-{
-  $EndPatchId = $1;
-}
-else
-{
-  die "RetrievePatches: Invalid EndPatchId $EndPatchId";
-}
-if ($EndPatchId < $StartPatchId)
-{
-  die "RetrievePatches: EndPatchId $EndPatchId shouldn't be smaller than StartPatchId $StartPatchId";
-}
-
-my $BaseURL = "http://source.winehq.org/patches/data";
-
-my $UA = LWP::UserAgent->new();
-$UA->agent("WineTestBot");
-
-foreach my $PatchId ($StartPatchId..$EndPatchId)
-{
-  my $Request = HTTP::Request->new(GET => "$BaseURL/$PatchId");
-  my $Response = $UA->request($Request);
-  if ($Response->code != RC_OK)
-  {
-    LogMsg "RetrievePatches: Unexpected HTTP response code ", 
-           $Response->code, "\n";
-    exit 1;
-  }
-  my $FileNameRandomPart = GenerateRandomString(32);
-  while (-e "$DataDir/staging/${FileNameRandomPart}_patch_$PatchId")
-  {
-    $FileNameRandomPart = GenerateRandomString(32);
-  }
-  my $StagingFileName = "$DataDir/staging/${FileNameRandomPart}_patch_$PatchId";
-  if (! open STAGINGFILE, ">$StagingFileName")
-  {
-    LogMsg "RetrievePatches: can't create staging file $StagingFileName: $!\n";
-    exit 1;
-  }
-  print STAGINGFILE $Response->decoded_content();
-  close STAGINGFILE;
-
-  PatchRetrieved("${FileNameRandomPart}_patch_$PatchId", $PatchId);
-
-  LogMsg "RetrievePatches: retrieved patch $PatchId\n";
-}
-
-exit;
diff --git a/testbot/bin/WinePatchesHandler.pl b/testbot/bin/WinePatchesHandler.pl
deleted file mode 100755
index f2b809e..0000000
--- a/testbot/bin/WinePatchesHandler.pl
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/usr/bin/perl -Tw
-#
-# This script expects to receive a wine-patches email on stdin and submits it
-# to WineTestBot for testing. It is meant to be called from a tool such as
-# procmail.
-#
-# Copyright 2009 Ge van Geldorp
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-
-use strict;
-
-my $Dir;
-sub BEGIN
-{
-  $0 =~ m=^(.*)/[^/]*$=;
-  $Dir = $1;
-}
-use lib "$Dir/../lib";
-
-use File::Copy;
-use WineTestBot::Config;
-use WineTestBot::Utils;
-use WineTestBot::Engine::Notify;
-
-# Store the message in the staging dir
-my $FileNameRandomPart = GenerateRandomString(32);
-while (-e ("$DataDir/staging/${FileNameRandomPart}_wine-patches"))
-{
-  $FileNameRandomPart = GenerateRandomString(32);
-}
-copy(\*STDIN, "$DataDir/staging/${FileNameRandomPart}_wine-patches");
-
-# Let the engine handle it
-NewWinePatchesSubmission("${FileNameRandomPart}_wine-patches");
-
-exit 0;
diff --git a/testbot/bin/WinePatchesMLSubmit.pl b/testbot/bin/WinePatchesMLSubmit.pl
new file mode 100755
index 0000000..9ab8b3c
--- /dev/null
+++ b/testbot/bin/WinePatchesMLSubmit.pl
@@ -0,0 +1,49 @@
+#!/usr/bin/perl -Tw
+#
+# This script expects to receive a wine-patches email on stdin and submits it
+# to WineTestBot for testing. It is meant to be called from a tool such as
+# procmail.
+#
+# Copyright 2009 Ge van Geldorp
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+
+use strict;
+
+my $Dir;
+sub BEGIN
+{
+  $0 =~ m=^(.*)/[^/]*$=;
+  $Dir = $1;
+}
+use lib "$Dir/../lib";
+
+use File::Copy;
+use WineTestBot::Config;
+use WineTestBot::Utils;
+use WineTestBot::Engine::Notify;
+
+# Store the message in the staging dir
+my $FileNameRandomPart = GenerateRandomString(32);
+while (-e ("$DataDir/staging/${FileNameRandomPart}_wine-patches"))
+{
+  $FileNameRandomPart = GenerateRandomString(32);
+}
+copy(\*STDIN, "$DataDir/staging/${FileNameRandomPart}_wine-patches");
+
+# Let the engine handle it
+WinePatchMLSubmission("${FileNameRandomPart}_wine-patches");
+
+exit 0;
diff --git a/testbot/bin/WinePatchesWebGet.pl b/testbot/bin/WinePatchesWebGet.pl
new file mode 100755
index 0000000..8533b95
--- /dev/null
+++ b/testbot/bin/WinePatchesWebGet.pl
@@ -0,0 +1,102 @@
+#!/usr/bin/perl -Tw
+#
+# Retrieve the latest patches from http://source.winehq.org/patches and submit
+# them for testing. See also WinePatchesWebNotify.pl.
+#
+# Copyright 2009 Ge van Geldorp
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+
+use strict;
+
+my $Dir;
+sub BEGIN
+{
+  $0 =~ m=^(.*)/[^/]*$=;
+  $Dir = $1;
+}
+use lib "$Dir/../lib";
+
+use LWP::UserAgent;
+use HTTP::Request;
+use HTTP::Response;
+use HTTP::Status;
+use WineTestBot::Config;
+use WineTestBot::Log;
+use WineTestBot::Utils;
+use WineTestBot::Engine::Notify;
+
+my ($StartPatchId, $EndPatchId) = @ARGV;
+if (! $StartPatchId || ! $EndPatchId)
+{
+  die "Usage: WinePatchesWebGet.pl <StartPatchId> <EndPatchId>";
+}
+
+if ($StartPatchId =~ m/^(\d+)$/)
+{
+  $StartPatchId = $1;
+}
+else
+{
+  die "WinePatchesWebGet: Invalid StartPatchId $StartPatchId";
+}
+if ($EndPatchId =~ m/^(\d+)$/)
+{
+  $EndPatchId = $1;
+}
+else
+{
+  die "WinePatchesWebGet: Invalid EndPatchId $EndPatchId";
+}
+if ($EndPatchId < $StartPatchId)
+{
+  die "WinePatchesWebGet: EndPatchId $EndPatchId shouldn't be smaller than StartPatchId $StartPatchId";
+}
+
+my $BaseURL = "http://source.winehq.org/patches/data";
+
+my $UA = LWP::UserAgent->new();
+$UA->agent("WineTestBot");
+
+foreach my $PatchId ($StartPatchId..$EndPatchId)
+{
+  my $Request = HTTP::Request->new(GET => "$BaseURL/$PatchId");
+  my $Response = $UA->request($Request);
+  if ($Response->code != RC_OK)
+  {
+    LogMsg "WinePatchesWebGet: Unexpected HTTP response code ",
+           $Response->code, "\n";
+    exit 1;
+  }
+  my $FileNameRandomPart = GenerateRandomString(32);
+  while (-e "$DataDir/staging/${FileNameRandomPart}_patch_$PatchId")
+  {
+    $FileNameRandomPart = GenerateRandomString(32);
+  }
+  my $StagingFileName = "$DataDir/staging/${FileNameRandomPart}_patch_$PatchId";
+  if (! open STAGINGFILE, ">$StagingFileName")
+  {
+    LogMsg "WinePatchesWebGet: can't create staging file $StagingFileName: $!\n";
+    exit 1;
+  }
+  print STAGINGFILE $Response->decoded_content();
+  close STAGINGFILE;
+
+  WinePatchWebSubmission("${FileNameRandomPart}_patch_$PatchId", $PatchId);
+
+  LogMsg "WinePatchesWebGet: retrieved patch $PatchId\n";
+}
+
+exit;
diff --git a/testbot/bin/WinePatchesWebNotify.pl b/testbot/bin/WinePatchesWebNotify.pl
new file mode 100755
index 0000000..185a0f1
--- /dev/null
+++ b/testbot/bin/WinePatchesWebNotify.pl
@@ -0,0 +1,48 @@
+#!/usr/bin/perl -Tw
+#
+# Notifies WineTestBot that there are new patches to test on
+# http://source.winehq.org/patches.
+#
+# Copyright 2009 Ge van Geldorp
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+
+use strict;
+
+my $Dir;
+sub BEGIN
+{
+  $0 =~ m=^(.*)/[^/]*$=;
+  $Dir = $1;
+}
+use lib "$Dir/../lib";
+
+use File::Copy;
+use WineTestBot::Config;
+use WineTestBot::Utils;
+use WineTestBot::Engine::Notify;
+
+# Store the message in the staging dir
+my $FileNameRandomPart = GenerateRandomString(32);
+while (-e ("$DataDir/staging/${FileNameRandomPart}_patchnotification"))
+{
+  $FileNameRandomPart = GenerateRandomString(32);
+}
+copy(\*STDIN, "$DataDir/staging/${FileNameRandomPart}_patchnotification");
+
+# Let the engine handle it
+WinePatchWebNotification("${FileNameRandomPart}_patchnotification");
+
+exit 0;
diff --git a/testbot/doc/INSTALL.txt b/testbot/doc/INSTALL.txt
index 7113c9a..27c4053 100644
--- a/testbot/doc/INSTALL.txt
+++ b/testbot/doc/INSTALL.txt
@@ -78,21 +78,21 @@ Setup for Wine's patches site:
   using the WineTestBot web interface and that the results are sane.
   You may also want to run with $PatchFromEMailOverride set for a while
   to spot any issue under load.
-- First bootstrap things with RetrievePatches.pl. Go to the patches
+- First bootstrap things with WinePatchesWebGet.pl. Go to the patches
   website and write down the id of the oldest and newest patches you
   want to inject into WineTestBot. Then run:
-  ./bin/RetrievePatches.pl OLD_PATCH_ID NEW_PATCH_ID
+  ./bin/WinePatchesWebGet.pl OLD_PATCH_ID NEW_PATCH_ID
 
 - If that goes well you can then keep WineTestBot up to date by
   following the steps below.
 - Set up an email address to receive the patches site notifications
   and send that email address to the patches maintainer.
-- Arrange for the PatchNotificationHandler.pl script to be fed the
+- Arrange for the WinePatchesWebNotify.pl script to be fed the
   notification emails. One way to do so would be to use procmail and
   add the following lines to the $HOME/.procmailrc file:
     :0:
     * ^Subject: New patches available at
-    | $HOME/tools/testbot/bin/PatchNotificationHandler.pl
+    | $HOME/tools/testbot/bin/WinePatchesWebNotify.pl
 
 Setup for Winetest updates:
 - Use a cron job to run CheckForWinetestUpdate.pl periodically. For
@@ -102,19 +102,19 @@ Setup for Winetest updates:
 Setup for wine-patches:
 - FIXME: WineTestBot now expects to receive the patches to test from
   Wine's Patches site instead of straight from the wine-patches mailing
-  list. Furthermore WinePatchesHandler.pl is currently broken (because
+  list. Furthermore WinePatchesMLSubmit.pl is currently broken (because
   the patch ids are no longer auto-generated). So this should be
   skipped.
-- Arrange for the WinePatchesHandler.pl script to be fed the
+- Arrange for the WinePatchesMLSubmit.pl script to be fed the
   wine-patches emails. One way to do so would be to subscribe the
   winehq user to the wine-patches mailing list and to then add the
   following lines to the .procmailrc file:
     :0:
     * ^List-Id: Wine Patch Submissions
-    | $HOME/tools/testbot/bin/WinePatchesHandler.pl
+    | $HOME/tools/testbot/bin/WinePatchesMLSubmit.pl
 - Or if you have a set of patches to test in the mbox format you can
   test with:
-  formail -s $HOME/tools/testbot/bin/WinePatchesHandler.pl <mbox-file
+  formail -s $HOME/tools/testbot/bin/WinePatchesMLSubmit.pl <mbox-file
 
 
 2. VM hosts setup
diff --git a/testbot/lib/WineTestBot/Engine/Notify.pm b/testbot/lib/WineTestBot/Engine/Notify.pm
index e461bb8..abe9030 100644
--- a/testbot/lib/WineTestBot/Engine/Notify.pm
+++ b/testbot/lib/WineTestBot/Engine/Notify.pm
@@ -35,8 +35,8 @@ require Exporter;
 @ISA = qw(Exporter);
 @EXPORT = qw(&PingEngine &JobSubmit &JobStatusChange &JobCancel &TaskComplete
              &VMStatusChange &ExpectWinetestUpdate &FoundWinetestUpdate
-             &NewWinePatchesSubmission &PatchNotification &PatchRetrieved
-             &GetScreenshot);
+             &WinePatchMLSubmission &WinePatchWebNotification
+             &WinePatchWebSubmission &GetScreenshot);
 @EXPORT_OK = qw($RunningInEngine);
 
 
@@ -198,11 +198,11 @@ sub FoundWinetestUpdate
   return substr($Reply, 1);
 }
 
-sub NewWinePatchesSubmission
+sub WinePatchMLSubmission
 {
   my $FileName = $_[0];
 
-  my $Reply = SendCmdReceiveReply("newwinepatchessubmission $FileName\n");
+  my $Reply = SendCmdReceiveReply("winepatchmlsubmission $FileName\n");
   if (length($Reply) < 1)
   {
     return "Unrecognized reply received from engine";
@@ -215,11 +215,11 @@ sub NewWinePatchesSubmission
   return substr($Reply, 1);
 }
 
-sub PatchNotification
+sub WinePatchWebNotification
 {
   my $FileName = $_[0];
 
-  my $Reply = SendCmdReceiveReply("patchnotification $FileName\n");
+  my $Reply = SendCmdReceiveReply("winepatchwebnotification $FileName\n");
   if (length($Reply) < 1)
   {
     return "Unrecognized reply received from engine";
@@ -232,11 +232,11 @@ sub PatchNotification
   return substr($Reply, 1);
 }
 
-sub PatchRetrieved
+sub WinePatchWebSubmission
 {
   my ($FileName, $PatchId) = @_;
 
-  my $Reply = SendCmdReceiveReply("patchretrieved $FileName $PatchId\n");
+  my $Reply = SendCmdReceiveReply("winepatchwebsubmission $FileName $PatchId\n");
   if (length($Reply) < 1)
   {
     return "Unrecognized reply received from engine";
-- 
1.7.10.4




More information about the wine-patches mailing list