Skip to content

fix(merge_overlay): pass node object, not its name string, to merge_nodes #164

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

Open
SoundMatt wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(merge_overlay): pass node object, not its name string, to merge_nodes #164

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
4 changes: 2 additions & 2 deletions ifex/transformers/merge_overlay.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,11 @@ def merge_nodes(node1: Any, node2: Any) -> Any:
if is_removal(value2.name):
merged_value = None # Not storing anything, so it's remmoved
else:
merged_value = merge_nodes(value1, name_only(value2))
merged_value = merge_nodes(value1, value2)
else: # value is a simple field. Therefore if value2 is defined, it
# overwrites the original value (there is no "merging" of two fundamental fields)
# If value2 is not defined, the result defaults back to original value1
merged_value = name_only(value2) or value1
merged_value = (name_only(value2) if isinstance(value2, str) else value2) or value1

merged_values[var] = merged_value

Expand Down