aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNiels Avonds <niels@codebits.be>2021-04-19 12:41:26 +0200
committerAnuj Mittal <anuj.mittal@intel.com>2021-04-28 09:07:02 +0800
commitb2ebbac82a8c319d934261449133d399fc17d8c1 (patch)
tree92b753ea1136230019d47c2789d463bbced18f66
parent1af4bd89964abfd59e77f8cfb7ed01a3fa017f50 (diff)
downloadbitbake-contrib-b2ebbac82a8c319d934261449133d399fc17d8c1.tar.gz
fetch/gitsm: Fix crash when using git LFS and submodulesstable/1.48-next
Gitsm fetcher crashes when cloning a repository that contains LFS files. This happens because the unpack method is called during download, but the submodules have not been downloaded yet at this point. This issue was introduced in this commit: 977b7268bf4fd425cb86d4a57500350c9b829162 [YOCTO #14283] Signed-off-by: Niels Avonds <niels@codebits.be> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 26caedc4d2e9b5a0f1d57f9291754a7f6c5e437e) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
-rw-r--r--lib/bb/fetch2/git.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/bb/fetch2/git.py b/lib/bb/fetch2/git.py
index b59a7cdc8..21ef85a2a 100644
--- a/lib/bb/fetch2/git.py
+++ b/lib/bb/fetch2/git.py
@@ -389,7 +389,7 @@ class Git(FetchMethod):
tmpdir = tempfile.mkdtemp(dir=d.getVar('DL_DIR'))
try:
# Do the checkout. This implicitly involves a Git LFS fetch.
- self.unpack(ud, tmpdir, d)
+ Git.unpack(self, ud, tmpdir, d)
# Scoop up a copy of any stuff that Git LFS downloaded. Merge them into
# the bare clonedir.