|
21 | 21 | from collections import namedtuple |
22 | 22 | from scanpipe.pipes.fetch import fetch_http |
23 | 23 | from scanpipe.pipes import federatedcode |
| 24 | +from minecode_pipeline.pipes import write_purls_to_repo |
24 | 25 | from jawa.util.utf import decode_modified_utf8 |
25 | 26 | from packagedcode.maven import get_urls |
26 | 27 | from packagedcode.maven import build_filename |
@@ -673,29 +674,14 @@ def collect_packages_from_maven(commits_per_push=10, logger=None): |
673 | 674 | if not prev_package: |
674 | 675 | prev_package = current_package |
675 | 676 | elif prev_package != current_package: |
| 677 | + push_commit = not bool(i % commits_per_push) |
676 | 678 | # save purls to yaml |
677 | | - ppath = hashid.get_package_purls_yml_file_path(prev_package) |
678 | | - purls = [package.purl for package in current_packages] |
679 | | - federatedcode.write_data_as_yaml( |
680 | | - base_path=repo.working_dir, |
681 | | - file_path=ppath, |
682 | | - data=purls, |
683 | | - ) |
684 | | - |
685 | | - change_type = "Add" if ppath in repo.untracked_files else "Update" |
686 | | - commit_message = f"""\ |
687 | | - {change_type} list of available {current_package} versions |
688 | | - """ |
689 | | - federatedcode.commit_changes( |
| 679 | + write_purls_to_repo( |
690 | 680 | repo=repo, |
691 | | - files_to_commit=[ppath], |
692 | | - commit_message=commit_message, |
| 681 | + package=prev_package, |
| 682 | + packages=current_packages, |
| 683 | + push_commit=push_commit |
693 | 684 | ) |
694 | | - |
695 | | - # see if we should push |
696 | | - if not bool(i % commits_per_push): |
697 | | - federatedcode.push_changes(repo=repo) |
698 | | - |
699 | 685 | current_packages = [] |
700 | 686 | prev_package = current_package |
701 | 687 | current_packages.append(package) |
|
0 commit comments