Francois Gouget : testbot: Use a more explicit filename to stage patchsets.

[Alexandre Julliard]

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

Author: Francois Gouget <fgouget at codeweavers.com>
Date:   Wed Jan 22 11:16:11 2020 +0100

testbot: Use a more explicit filename to stage patchsets.

Use a different filename for patches and patchsets so that in case of
trouble one can trace the staging file to its source.

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

---

 testbot/bin/Janitor.pl                      | 2 +-
 testbot/lib/WineTestBot/PendingPatchSets.pm | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl
index 121a3a6..115b7d5 100755
--- a/testbot/bin/Janitor.pl
+++ b/testbot/bin/Janitor.pl
@@ -276,7 +276,7 @@ if (opendir(my $dh, "$DataDir/staging"))
       # These files always expire after one day
       $TTL = 1 - $Age;
     }
-    elsif ($Entry !~ /^[0-9a-f]{32}_(?:patch|patch\.diff|wine-patches|winetest(?:64)?-latest\.exe)$/)
+    elsif ($Entry !~ /^[0-9a-f]{32}_(?:patch\.diff|patchset\.diff|wine-patches|winetest(?:64)?-latest\.exe)$/)
     {
       my $Deletion = defined $TTL ? " (deletion in $TTL days)" : "";
       Error "Found a suspicious file$Deletion: staging/$Entry\n";
diff --git a/testbot/lib/WineTestBot/PendingPatchSets.pm b/testbot/lib/WineTestBot/PendingPatchSets.pm
index 286b393..5be39e4 100644
--- a/testbot/lib/WineTestBot/PendingPatchSets.pm
+++ b/testbot/lib/WineTestBot/PendingPatchSets.pm
@@ -104,7 +104,7 @@ sub SubmitSubset($$$)
 {
   my ($self, $MaxPart, $FinalPatch) = @_;
 
-  my ($CombinedFile, $CombinedFileName) = OpenNewFile("$DataDir/staging", "_patch");
+  my ($CombinedFile, $CombinedFileName) = OpenNewFile("$DataDir/staging", "_patchset.diff");
   return "Could not create a combined patch file: $!" if (!$CombinedFile);
 
   my $ErrMessage;