| Message ID | 20250808084931.2156763-23-akash.hadke27@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [poky,scarthgap,01/23] bitbake: fetch2/git: Use git shallow fetch to implement clone_shallow_local() | expand |
Thank you for your submission. Patchtest identified one or more issues with the patch. Please see the log below for more information: --- Testing patch /home/patchtest/share/mboxes/poky-scarthgap-23-23-bitbake-fetch2-git-Add-multiple-revision-support.patch FAIL: test target mailing list: Series sent to the wrong mailing list or some patches from the series correspond to different mailing lists (test_mbox.TestMbox.test_target_mailing_list) PASS: pretest pylint (test_python_pylint.PyLint.pretest_pylint) PASS: test Signed-off-by presence (test_mbox.TestMbox.test_signed_off_by_presence) PASS: test author valid (test_mbox.TestMbox.test_author_valid) PASS: test commit message presence (test_mbox.TestMbox.test_commit_message_presence) PASS: test commit message user tags (test_mbox.TestMbox.test_commit_message_user_tags) PASS: test max line length (test_metadata.TestMetadata.test_max_line_length) PASS: test mbox format (test_mbox.TestMbox.test_mbox_format) PASS: test non-AUH upgrade (test_mbox.TestMbox.test_non_auh_upgrade) PASS: test pylint (test_python_pylint.PyLint.test_pylint) PASS: test shortlog format (test_mbox.TestMbox.test_shortlog_format) PASS: test shortlog length (test_mbox.TestMbox.test_shortlog_length) SKIP: pretest src uri left files: No modified recipes, skipping pretest (test_metadata.TestMetadata.pretest_src_uri_left_files) SKIP: test CVE check ignore: No modified recipes or older target branch, skipping test (test_metadata.TestMetadata.test_cve_check_ignore) SKIP: test CVE tag format: No new CVE patches introduced (test_patch.TestPatch.test_cve_tag_format) SKIP: test Signed-off-by presence: No new CVE patches introduced (test_patch.TestPatch.test_signed_off_by_presence) SKIP: test Upstream-Status presence: No new CVE patches introduced (test_patch.TestPatch.test_upstream_status_presence_format) SKIP: test bugzilla entry format: No bug ID found (test_mbox.TestMbox.test_bugzilla_entry_format) SKIP: test lic files chksum modified not mentioned: No modified recipes, skipping test (test_metadata.TestMetadata.test_lic_files_chksum_modified_not_mentioned) SKIP: test lic files chksum presence: No added recipes, skipping test (test_metadata.TestMetadata.test_lic_files_chksum_presence) SKIP: test license presence: No added recipes, skipping test (test_metadata.TestMetadata.test_license_presence) SKIP: test series merge on head: Merge test is disabled for now (test_mbox.TestMbox.test_series_merge_on_head) SKIP: test src uri left files: No modified recipes, skipping pretest (test_metadata.TestMetadata.test_src_uri_left_files) SKIP: test summary presence: No added recipes, skipping test (test_metadata.TestMetadata.test_summary_presence) --- Please address the issues identified and submit a new revision of the patch, or alternatively, reply to this email with an explanation of why the patch should be accepted. If you believe these results are due to an error in patchtest, please submit a bug at https://bugzilla.yoctoproject.org/ (use the 'Patchtest' category under 'Yocto Project Subprojects'). For more information on specific failures, see: https://wiki.yoctoproject.org/wiki/Patchtest. Thank you!
diff --git a/bitbake/lib/bb/fetch2/git.py b/bitbake/lib/bb/fetch2/git.py index 390d9ddafc..88fa119e1d 100644 --- a/bitbake/lib/bb/fetch2/git.py +++ b/bitbake/lib/bb/fetch2/git.py @@ -513,12 +513,13 @@ class Git(FetchMethod): raise bb.fetch2.FetchError("Unable to find revision %s even from upstream" % missing_rev) if self.lfs_need_update(ud, d): - self.lfs_fetch(ud, d, ud.clonedir, ud.revision) + for name in ud.names: + self.lfs_fetch(ud, d, name, ud.clonedir, ud.revisions[name]) - def lfs_fetch(self, ud, d, clonedir, revision, fetchall=False, progresshandler=None): + def lfs_fetch(self, ud, d, name, clonedir, revision, fetchall=False, progresshandler=None): """Helper method for fetching Git LFS data""" try: - if self._need_lfs(ud) and self._contains_lfs(ud, d, clonedir) and len(revision): + if self._need_lfs(ud) and self._contains_lfs(ud, d, name, clonedir) and len(revision): self._ensure_git_lfs(d, ud) # Using worktree with the revision because .lfsconfig may exists @@ -649,7 +650,7 @@ class Git(FetchMethod): runfetchcmd(fetch_cmd, d, workdir=dest) runfetchcmd("%s update-ref %s %s" % (ud.basecmd, ref, revision), d, workdir=dest) # Fetch Git LFS data - self.lfs_fetch(ud, d, dest, ud.revisions[ud.names[0]]) + self.lfs_fetch(ud, d, name, dest, ud.revisions[ud.names[0]]) # Apply extra ref wildcards all_refs_remote = runfetchcmd("%s ls-remote origin 'refs/*'" % ud.basecmd, \ @@ -738,7 +739,7 @@ class Git(FetchMethod): repourl = self._get_repo_url(ud) runfetchcmd("%s remote set-url origin %s" % (ud.basecmd, shlex.quote(repourl)), d, workdir=destdir) - if self._contains_lfs(ud, d, destdir): + if any(self._contains_lfs(ud, d, name, destdir) for name in ud.names): if not need_lfs: bb.note("Repository %s has LFS content but it is not being fetched" % (repourl)) else: @@ -806,8 +807,9 @@ class Git(FetchMethod): Verifies whether the LFS objects for requested revisions have already been downloaded """ # Bail out early if this repository doesn't use LFS - if not self._contains_lfs(ud, d, wd): - return True + for name in ud.names: + if not self._contains_lfs(ud, d, name, wd): + return True self._ensure_git_lfs(d, ud) @@ -835,12 +837,12 @@ class Git(FetchMethod): def _need_lfs(self, ud): return ud.parm.get("lfs", "1") == "1" - def _contains_lfs(self, ud, d, wd): + def _contains_lfs(self, ud, d, name, wd): """ Check if the repository has 'lfs' (large file) content """ cmd = "%s grep lfs %s:.gitattributes | wc -l" % ( - ud.basecmd, ud.revision) + ud.basecmd, ud.revisions[name]) try: output = runfetchcmd(cmd, d, quiet=True, workdir=wd)
In scarthgap single SRC_URI can still have multiple revisions update the code in order to iterate over these revisions and do the fetch. Signed-off-by: Akash Hadke <akash.hadke27@gmail.com> --- bitbake/lib/bb/fetch2/git.py | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-)