Fix for replace stacks not working when agents was on multiline #7286
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
benoitf
added
status/code-review
|
Can one of the admins verify this patch? |
1 similar comment
|
Can one of the admins verify this patch? |
|
there is a conflict on the file |
JPinkney
force-pushed
the
replace_stacks_fix
branch
from
0dd9a52
to
53cf380
Compare
Signed-off-by: jpinkney <josh.pinkney@mail.utoronto.ca>
JPinkney
force-pushed
the
replace_stacks_fix
branch
from
53cf380
to
d426916
Compare
|
I believe the conflict should be fixed now |
benoitf
approved these changes
Nov 15, 2017
l0rd
approved these changes
Nov 15, 2017
riuvshin
approved these changes
Nov 15, 2017
l0rd
removed
the
status/code-review
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.
What does this PR do?
This PR fixes replace_stacks to work with agents that are in a flat list in the stacks json as well as multi line. The regression was introduced in 2e90ad6 due to a misunderstanding of sed as well as a misunderstanding of the use case.
What issues does this PR fix or reference?
Fixes replace_stacks to work with agents that are a flat list in the stacks json as well as multi line.
Previously it would not remove com.redhat.bayesian.lsp from something like https://github.com/redhat-developer/rh-che/blob/master/assembly/fabric8-stacks/src/main/resources/stacks.json#L542 but would work for something like https://github.com/redhat-developer/rh-che/blob/master/assembly/fabric8-stacks/src/main/resources/stacks.json#L184. This PR makes it work for both cases.
Release Notes
N/A