Skip to content

Always merge ancestor pom data #160 #171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 9, 2023
Merged

Always merge ancestor pom data #160 #171

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 1 addition & 11 deletions minecode/visitors/maven.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,9 +247,7 @@ def merge_parent(package, parent_package):

def merge_ancestors(ancestor_pom_texts, package):
"""
Merge metadata from `ancestor_pom_text` into `package`. Skip merging
metadata from an ancestor if the ancestor's namespace is not contained in
the `package`'s namespace.
Merge metadata from `ancestor_pom_text` into `package`.

The order of POM content in `ancestor_pom_texts` is expected to be in the
order of oldest ancestor to newest.
Expand All @@ -261,14 +259,6 @@ def merge_ancestors(ancestor_pom_texts, package):
primary_language='Java',
text=ancestor_pom_text
)
if ancestor_package.namespace not in package.namespace:
msg = f'merge_ancestors: {ancestor_package.purl} data not added to package: ancestor package namespace is not contained in {package.purl} namespace'
history = package.extra_data.get('history')
if history:
package.extra_data['history'].append(msg)
else:
package.extra_data['history'] = [msg]
continue
package = merge_parent(package, ancestor_package)
return package

Expand Down