mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-09 17:39:31 +00:00
Code Issues Projects Releases Wiki Activity

bitbake: git.py: Use the correct branch to check if the repository has LFS objects.

Browse Source 
Function "contains_lfs" was only looking at the master branch when searching for LFS
content. LFS may be configured in specific branches only, so we need to use the
correct branch.

(Bitbake rev: 4fa67c2af830035a1ddedc14592ee25a15ebff22)

Signed-off-by: Mauro Queiros <maurofrqueiros@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Mauro Queirós
2020-05-29 11:06:09 +01:00
committed by Richard Purdie
parent 3f8b8f8bca
commit d648096794
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitbake/lib/bb/fetch2/git.py
+9 -2
View File
@@ -566,8 +566,15 @@ class Git(FetchMethod):
""" """
Check if the repository has 'lfs' (large file) content Check if the repository has 'lfs' (large file) content
""" """
cmd = "%s grep lfs HEAD:.gitattributes | wc -l" % (
ud.basecmd) if not ud.nobranch:
branchname = ud.branches[ud.names[0]]
else:
branchname = "master"
cmd = "%s grep lfs origin/%s:.gitattributes | wc -l" % (
ud.basecmd, ud.branches[ud.names[0]])
try: try:
output = runfetchcmd(cmd, d, quiet=True, workdir=wd) output = runfetchcmd(cmd, d, quiet=True, workdir=wd)
if int(output) > 0: if int(output) > 0: