Francois Gouget : testbot/WineRunReconfig: Also retrieve the wine-parentsrc.txt file.

Alexandre Julliard julliard at winehq.org
Mon Jan 7 10:49:43 CST 2019


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

Author: Francois Gouget <fgouget at codeweavers.com>
Date:   Mon Jan  7 12:03:21 2019 +0100

testbot/WineRunReconfig: Also retrieve the wine-parentsrc.txt file.

It is needed to properly handle patches to modules with the PARENTSRC
setting.

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

---

 testbot/bin/WineRunReconfig.pl | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl
index 11f92c8..d7e72bf 100755
--- a/testbot/bin/WineRunReconfig.pl
+++ b/testbot/bin/WineRunReconfig.pl
@@ -433,14 +433,17 @@ if ($NewStatus eq "completed")
     }
   }
 
-  Debug(Elapsed($Start), " Retrieving the list of Wine files '$TaskDir/winefiles.txt'\n");
-  if ($TA->GetFile("latest/winefiles.txt", "$TaskDir/winefiles.txt"))
+  foreach my $FileName ("winefiles.txt", "wine-parentsrc.txt")
   {
-    copy "$TaskDir/winefiles.txt", "$DataDir/latest/winefiles.txt";
-  }
-  elsif (!defined $TAError)
-  {
-    $TAError = "An error occurred while retrieving the list of Wine files: ". $TA->GetLastError();
+    Debug(Elapsed($Start), " Retrieving '$TaskDir/$FileName'\n");
+    if ($TA->GetFile("latest/$FileName", "$TaskDir/$FileName"))
+    {
+      copy "$TaskDir/$FileName", "$DataDir/latest/$FileName";
+    }
+    elsif (!defined $TAError)
+    {
+      $TAError = "An error occurred while retrieving '$TaskDir/$FileName': ". $TA->GetLastError();
+    }
   }
 }
 




More information about the wine-cvs mailing list