testbot/build: Chdir to the Wine source directory before calling 'git apply'.

Francois Gouget fgouget at codeweavers.com
Tue Dec 4 22:35:10 CST 2012


The --directory option is not meant to specify where the Git repository lives.
---

I'm not sure how it worked before. Maybe this use of the --directory 
option worked by chance but git changed and broke it.

 testbot/bin/build/Build.pl |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl
index 7a20c1a..c2e53e6 100755
--- a/testbot/bin/build/Build.pl
+++ b/testbot/bin/build/Build.pl
@@ -109,8 +109,9 @@ sub ApplyPatch
   }
 
   InfoMsg "Applying patch\n";
-  system("git apply --verbose --directory=$DataDir/wine-git $PatchFile " .
-         ">> $LogDir/Build.log 2>&1");
+  system("( cd $DataDir/wine-git && set -x && " .
+         "  git apply --verbose $PatchFile " .
+         ") >> $LogDir/Build.log 2>&1");
   if ($? != 0)
   {
     LogMsg "Patch failed to apply\n";
-- 
1.7.10.4




More information about the wine-patches mailing list