summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNiels Avonds <niels@codebits.be>2021-05-03 22:35:54 +0800
committerSteve Sakoman <steve@sakoman.com>2021-05-05 06:04:11 -1000
commit631c0fa02c12cb48bcee4fa602c1ee4693ed689b (patch)
tree9aa78d99383fdbe3f3a42310f84d4ec72cc3a319
parent99fa63415cabf3129f149c2cdb557ec18b06b98a (diff)
downloadbitbake-contrib-stable/1.46-nut.tar.gz
bitbake-contrib-stable/1.46-nut.tar.bz2
bitbake-contrib-stable/1.46-nut.zip
fetch/gitsm: Fix crash when using git LFS and submodulesstable/1.46-nutstable/1.46-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> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit e05d79a6ed92c9ce17b90fd5fb6186898a7b3bf8) Signed-off-by: Steve Sakoman <steve@sakoman.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 8740e9c05f..112b833f87 100644
--- a/lib/bb/fetch2/git.py
+++ b/lib/bb/fetch2/git.py
@@ -388,7 +388,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.