diff options
Diffstat (limited to 'meta/lib')
-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 afb0013a4b..c4f042d54b 100644 --- a/meta/lib/oe/patch.py +++ b/meta/lib/oe/patch.py | |||
@@ -398,17 +398,17 @@ class GitApplyTree(PatchTree): | |||
398 | try: | 398 | try: |
399 | patchfilevar = 'PATCHFILE="%s"' % os.path.basename(patch['file']) | 399 | patchfilevar = 'PATCHFILE="%s"' % os.path.basename(patch['file']) |
400 | try: | 400 | try: |
401 | shellcmd = [patchfilevar, "git", "--work-tree=.", "am", "-3", "--keep-cr", "-p%s" % patch['strippath']] | 401 | shellcmd = [patchfilevar, "git", "--work-tree=%s" % reporoot, "am", "-3", "--keep-cr", "-p%s" % patch['strippath']] |
402 | return _applypatchhelper(shellcmd, patch, force, reverse, run) | 402 | return _applypatchhelper(shellcmd, patch, force, reverse, run) |
403 | except CmdError: | 403 | except CmdError: |
404 | # Need to abort the git am, or we'll still be within it at the end | 404 | # Need to abort the git am, or we'll still be within it at the end |
405 | try: | 405 | try: |
406 | shellcmd = ["git", "--work-tree=.", "am", "--abort"] | 406 | shellcmd = ["git", "--work-tree=%s" % reporoot, "am", "--abort"] |
407 | runcmd(["sh", "-c", " ".join(shellcmd)], self.dir) | 407 | runcmd(["sh", "-c", " ".join(shellcmd)], self.dir) |
408 | except CmdError: | 408 | except CmdError: |
409 | pass | 409 | pass |
410 | # Fall back to git apply | 410 | # Fall back to git apply |
411 | shellcmd = ["git", "--git-dir=.", "apply", "-p%s" % patch['strippath']] | 411 | shellcmd = ["git", "--git-dir=%s" % reporoot, "apply", "-p%s" % patch['strippath']] |
412 | try: | 412 | try: |
413 | output = _applypatchhelper(shellcmd, patch, force, reverse, run) | 413 | output = _applypatchhelper(shellcmd, patch, force, reverse, run) |
414 | except CmdError: | 414 | except CmdError: |