diff options
-rw-r--r-- | meta/lib/patchtest/repo.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/patchtest/repo.py b/meta/lib/patchtest/repo.py index 8ec8f68a0b..2cdd6736e4 100644 --- a/meta/lib/patchtest/repo.py +++ b/meta/lib/patchtest/repo.py | |||
@@ -52,7 +52,7 @@ class PatchTestRepo(object): | |||
52 | self._patchcanbemerged = True | 52 | self._patchcanbemerged = True |
53 | try: | 53 | try: |
54 | # Make sure to get the absolute path of the file | 54 | # Make sure to get the absolute path of the file |
55 | self.repo.git.execute(['git', 'apply', '--check', os.path.abspath(self.patch.path)], with_exceptions=True) | 55 | self.repo.git.execute(['git', '-C', self.repodir, 'apply', '--check', os.path.abspath(self.patch.path)], with_exceptions=True) |
56 | except git.exc.GitCommandError as ce: | 56 | except git.exc.GitCommandError as ce: |
57 | self._patchcanbemerged = False | 57 | self._patchcanbemerged = False |
58 | 58 | ||
@@ -76,7 +76,7 @@ class PatchTestRepo(object): | |||
76 | 76 | ||
77 | def merge(self): | 77 | def merge(self): |
78 | if self._patchcanbemerged: | 78 | if self._patchcanbemerged: |
79 | self.repo.git.execute(['git', 'am', '--keep-cr', os.path.abspath(self.patch.path)]) | 79 | self.repo.git.execute(['git', '-C', self.repodir, 'am', '--keep-cr', os.path.abspath(self.patch.path)]) |
80 | self._patchmerged = True | 80 | self._patchmerged = True |
81 | 81 | ||
82 | def clean(self): | 82 | def clean(self): |