Fix conflicting "name" for SLES15 and SLES15 for SAP uyuni client tools spacewalk-common-channel. #7714
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 change?
Change NAME of multiple SLES15 for SAP channels to include "SAP" at the end.
This PR resolves a conflict caused by duplicated names for SLES15 and SLES15 for SAP.
This logic was applied based on current SLES12 and SLES12 for SAP.
Steps to reproduce the conflict:
Expected result:
Both channels are active.
Actual result:
Error activating "second" channel
Uyuni version
Uyuni release [2023.04]
GUI diff
No difference.
Documentation
No documentation needed: We don't document all channels at spacewalk-common-channels.
DONE
Test coverage
No tests: Manually tested
DONE
Links
Tracks # Added SLES12 SP5 and SLES4SAP
Changelogs
https://github.com/majchroo/uyuni/blob/master/utils/spacewalk-utils.changes.majchroo.fix-conflicting-uyuni-tools
Re-run a test
If you need to re-run a test, please mark the related checkbox, it will be unchecked automatically once it has re-run: