Fix to resolve env in key before merging #874
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rakillen
reviewed
Apr 20, 2021
rakillen
approved these changes
Apr 20, 2021
ddsharpe
reviewed
Apr 20, 2021
| @@ -305,6 +305,7 @@ def merge_model_files(model_file_value, variable_map=None): | |||
| It may be a single file, or a comma-separated list of files. | |||
| :param variable_map: variables to be used for name resolution, or None | |||
| :param model_file_value: the value specified as a command argument | |||
| ;param model_context: model context | |||
There was a problem hiding this comment.
looks like a semi-colon here instead of a colon
There was a problem hiding this comment.
model_context isn't an argument any more, can be removed
ddsharpe
approved these changes
Apr 20, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This fix is for JIRA WDT 552 - resolving the key in the model with @@env notation before merging the models to avoid having duplicate copies of the same key element in the model resulting wrong domain created.