diff options
Diffstat (limited to 'meta/lib/oe/patch.py')
-rw-r--r-- | meta/lib/oe/patch.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py index f68d40f8c8..6b41dc6d12 100644 --- a/meta/lib/oe/patch.py +++ b/meta/lib/oe/patch.py | |||
@@ -334,17 +334,17 @@ class GitApplyTree(PatchTree): | |||
334 | try: | 334 | try: |
335 | patchfilevar = 'PATCHFILE="%s"' % os.path.basename(patch['file']) | 335 | patchfilevar = 'PATCHFILE="%s"' % os.path.basename(patch['file']) |
336 | try: | 336 | try: |
337 | shellcmd = [patchfilevar, "git", "--work-tree=.", "am", "-3", "--keep-cr", "-p%s" % patch['strippath']] | 337 | shellcmd = [patchfilevar, "git", "--work-tree=%s" % reporoot, "am", "-3", "--keep-cr", "-p%s" % patch['strippath']] |
338 | return _applypatchhelper(shellcmd, patch, force, reverse, run) | 338 | return _applypatchhelper(shellcmd, patch, force, reverse, run) |
339 | except CmdError: | 339 | except CmdError: |
340 | # Need to abort the git am, or we'll still be within it at the end | 340 | # Need to abort the git am, or we'll still be within it at the end |
341 | try: | 341 | try: |
342 | shellcmd = ["git", "--work-tree=.", "am", "--abort"] | 342 | shellcmd = ["git", "--work-tree=%s" % reporoot, "am", "--abort"] |
343 | runcmd(["sh", "-c", " ".join(shellcmd)], self.dir) | 343 | runcmd(["sh", "-c", " ".join(shellcmd)], self.dir) |
344 | except CmdError: | 344 | except CmdError: |
345 | pass | 345 | pass |
346 | # Fall back to git apply | 346 | # Fall back to git apply |
347 | shellcmd = ["git", "--git-dir=.", "apply", "-p%s" % patch['strippath']] | 347 | shellcmd = ["git", "--git-dir=%s" % reporoot, "apply", "-p%s" % patch['strippath']] |
348 | try: | 348 | try: |
349 | output = _applypatchhelper(shellcmd, patch, force, reverse, run) | 349 | output = _applypatchhelper(shellcmd, patch, force, reverse, run) |
350 | except CmdError: | 350 | except CmdError: |