top file compilation fixes #26657
Merged
top file compilation fixes #26657
Conversation
This file contains 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
jfindlay
added
Core
| @@ -2305,7 +2305,10 @@ def __gen_opts(self, opts): | |||
| 'state_auto_order', | |||
| opts['state_auto_order']) | |||
| opts['file_roots'] = mopts['file_roots'] | |||
| opts['env_order'] = mopts['env_order'] | |||
| opts['top_file_merging_strategy'] = mopts.get('top_file_merging_strategy', | |||
There was a problem hiding this comment.
@cachedout, is this the correct way to prefer master opts, with a fallback to minion opts, for example to handle the masterless case?
There was a problem hiding this comment.
I think this will be just fine. Thanks.
|
This all looks great. Excellent work. @jfindlay |
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.
@cachedout, please review.
Also see:
https://gist.github.com/jfindlay/b2e6807354b304d282d4
https://gist.github.com/jfindlay/99a84526ef1d4a954ad0
References:
#24878
#26307