diff options
| -rw-r--r-- | bitbake/lib/bb/fetch2/git.py | 5 | ||||
| -rw-r--r-- | bitbake/lib/bb/tests/fetch.py | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/bitbake/lib/bb/fetch2/git.py b/bitbake/lib/bb/fetch2/git.py index d34ea1de29..35e0db56cf 100644 --- a/bitbake/lib/bb/fetch2/git.py +++ b/bitbake/lib/bb/fetch2/git.py | |||
| @@ -125,6 +125,9 @@ class GitProgressHandler(bb.progress.LineFilterProgressHandler): | |||
| 125 | 125 | ||
| 126 | 126 | ||
| 127 | class Git(FetchMethod): | 127 | class Git(FetchMethod): |
| 128 | bitbake_dir = os.path.abspath(os.path.join(os.path.dirname(os.path.join(os.path.abspath(__file__))), '..', '..', '..')) | ||
| 129 | make_shallow_path = os.path.join(bitbake_dir, 'bin', 'git-make-shallow') | ||
| 130 | |||
| 128 | """Class to fetch a module or modules from git repositories""" | 131 | """Class to fetch a module or modules from git repositories""" |
| 129 | def init(self, d): | 132 | def init(self, d): |
| 130 | pass | 133 | pass |
| @@ -446,7 +449,7 @@ class Git(FetchMethod): | |||
| 446 | shallow_branches.append(r) | 449 | shallow_branches.append(r) |
| 447 | 450 | ||
| 448 | # Make the repository shallow | 451 | # Make the repository shallow |
| 449 | shallow_cmd = ['git', 'make-shallow', '-s'] | 452 | shallow_cmd = [self.make_shallow_path, '-s'] |
| 450 | for b in shallow_branches: | 453 | for b in shallow_branches: |
| 451 | shallow_cmd.append('-r') | 454 | shallow_cmd.append('-r') |
| 452 | shallow_cmd.append(b) | 455 | shallow_cmd.append(b) |
diff --git a/bitbake/lib/bb/tests/fetch.py b/bitbake/lib/bb/tests/fetch.py index 11698f2091..62b88f1380 100644 --- a/bitbake/lib/bb/tests/fetch.py +++ b/bitbake/lib/bb/tests/fetch.py | |||
| @@ -874,9 +874,6 @@ class FetchCheckStatusTest(FetcherTest): | |||
| 874 | 874 | ||
| 875 | 875 | ||
| 876 | class GitMakeShallowTest(FetcherTest): | 876 | class GitMakeShallowTest(FetcherTest): |
| 877 | bitbake_dir = os.path.join(os.path.dirname(os.path.join(os.path.abspath(__file__))), '..', '..', '..') | ||
| 878 | make_shallow_path = os.path.join(bitbake_dir, 'bin', 'git-make-shallow') | ||
| 879 | |||
| 880 | def setUp(self): | 877 | def setUp(self): |
| 881 | FetcherTest.setUp(self) | 878 | FetcherTest.setUp(self) |
| 882 | self.gitdir = os.path.join(self.tempdir, 'gitshallow') | 879 | self.gitdir = os.path.join(self.tempdir, 'gitshallow') |
| @@ -905,7 +902,7 @@ class GitMakeShallowTest(FetcherTest): | |||
| 905 | def make_shallow(self, args=None): | 902 | def make_shallow(self, args=None): |
| 906 | if args is None: | 903 | if args is None: |
| 907 | args = ['HEAD'] | 904 | args = ['HEAD'] |
| 908 | return bb.process.run([self.make_shallow_path] + args, cwd=self.gitdir) | 905 | return bb.process.run([bb.fetch2.git.Git.make_shallow_path] + args, cwd=self.gitdir) |
| 909 | 906 | ||
| 910 | def add_empty_file(self, path, msg=None): | 907 | def add_empty_file(self, path, msg=None): |
| 911 | if msg is None: | 908 | if msg is None: |
