Pass -p to 'git apply', pass correct patch component

buildbot · Apr 4, 2012 · dd668ee · dd668ee
1 parent 6da04ee
commit dd668ee
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/master/buildbot/steps/source/git.py b/master/buildbot/steps/source/git.py
@@ -288,7 +288,8 @@ def renameBranch(res):
         return d
 
     def patch(self, _, patch):
-        d = self._dovccmd(['apply', '--index'], initialStdin=patch)
+        d = self._dovccmd(['apply', '--index', '-p', str(patch[0])],
+                initialStdin=patch[1])
         return d
 
     @defer.inlineCallbacks

diff --git a/master/buildbot/test/unit/test_steps_source_git.py b/master/buildbot/test/unit/test_steps_source_git.py
@@ -62,7 +62,7 @@ def test_mode_full_clean_patch(self):
         self.setupStep(
                 git.Git(repourl='http://github.com/buildbot/buildbot.git',
                                     mode='full', method='clean'),
-                patch = 'patch')
+                patch=(1, 'patch'))
         self.expectCommands(
             ExpectShell(workdir='wkdir',
                         command=['git', '--version'])
@@ -82,7 +82,7 @@ def test_mode_full_clean_patch(self):
                         command=['git', 'reset', '--hard', 'FETCH_HEAD'])
             + 0,
             ExpectShell(workdir='wkdir',
-                        command=['git', 'apply', '--index'],
+                        command=['git', 'apply', '--index', '-p', '1'],
                         initialStdin='patch')
             + 0,
             ExpectShell(workdir='wkdir',
@@ -98,7 +98,7 @@ def test_mode_full_clean_patch_fail(self):
         self.setupStep(
                 git.Git(repourl='http://github.com/buildbot/buildbot.git',
                                     mode='full', method='clean'),
-                patch = 'patch')
+                patch=(1, 'patch'))
         self.expectCommands(
             ExpectShell(workdir='wkdir',
                         command=['git', '--version'])
@@ -118,7 +118,7 @@ def test_mode_full_clean_patch_fail(self):
                         command=['git', 'reset', '--hard', 'FETCH_HEAD'])
             + 0,
             ExpectShell(workdir='wkdir',
-                        command=['git', 'apply', '--index'],
+                        command=['git', 'apply', '--index', '-p', '1'],
                         initialStdin='patch')
             + 1,
         )