Skip to content
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.

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

Handle properly all types in config during branch #641

Merged
merged 8 commits into from
Aug 27, 2021

Conversation

bouthilx
Copy link
Member

Why:

During resolution of conflicts, the user's script configuration file is
parsed for any marked resolution. This parsing is not handling properly
values that may not be string and causes Oríon to crash.

How:

The values should only be handled if they are string and contain the
value '~' as this is the only way to mark a resolution. They can be
safely ignored otherwise.

Why:

During resolution of conflicts, the user's script configuration file is
parsed for any marked resolution. This parsing is not handling properly
values that may not be string and causes Oríon to crash.

How:

The values should only be handled if they are string and contain the
value '~' as this is the only way to mark a resolution. They can be
safely ignored otherwise.
@bouthilx bouthilx added bug Indicates an unexpected problem or unintended behavior medium The bug breaks a feature but it can still be used or causes a confusing user experience labels Aug 24, 2021
@bouthilx bouthilx added this to the v0.1.17 milestone Aug 24, 2021
@bouthilx bouthilx merged commit 5099fe9 into Epistimio:develop Aug 27, 2021
@bouthilx bouthilx deleted the hotfix/config_conflict_any_type branch August 27, 2021 17:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Indicates an unexpected problem or unintended behavior medium The bug breaks a feature but it can still be used or causes a confusing user experience
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant