Francois Gouget : testbot/build: Chdir to the Wine source directory before calling 'git apply'.
Alexandre Julliard
julliard at winehq.org
Wed Dec 5 13:20:22 CST 2012
Module: tools
Branch: master
Commit: f2b993f5b366664295708d63a4c330ff58155e9b
URL: http://source.winehq.org/git/tools.git/?a=commit;h=f2b993f5b366664295708d63a4c330ff58155e9b
Author: Francois Gouget <fgouget at codeweavers.com>
Date: Wed Dec 5 05:35:10 2012 +0100
testbot/build: Chdir to the Wine source directory before calling 'git apply'.
The --directory option is not meant to specify where the Git repository lives.
---
testbot/bin/build/Build.pl | 5 +++--
1 files 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";
More information about the wine-cvs
mailing list