Change conflict handling and add some features #16315
Merged
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
dzedro
force-pushed
the
update_conflict
branch
from
59515e4 to
e37df45
Compare
dzedro
force-pushed
the
update_conflict
branch
from
e37df45 to
9923eba
Compare
dzedro
force-pushed
the
update_conflict
branch
8 times, most recently
from
f663399 to
65913aa
Compare
dzedro
force-pushed
the
update_conflict
branch
from
65913aa to
83ac503
Compare
dzedro
force-pushed
the
update_conflict
branch
from
7a2d257 to
76709b1
Compare
dzedro
force-pushed
the
update_conflict
branch
4 times, most recently
from
e2e51d1 to
2335e23
Compare
dzedro
force-pushed
the
update_conflict
branch
from
2335e23 to
d0cafab
Compare
dzedro
force-pushed
the
update_conflict
branch
from
d0cafab to
4360cc0
Compare
dzedro
changed the title
dzedro
added
Ready
|
Commit message has a typo: Change conflict handling and add som features -> Change conflict handling and add some features |
|
One more minor comment, can we add a setting like "CONFLICT_PACKAGES" to add more if any? anyway, it is not hard required. |
You mean like with |
Yes! |
- get_patch will return list of patches - print info of processed Modules, Packages, Patches and repos for better overview and easier debugging
Preinstall is trying to install all packages from patch at once, it can happen not all pacakges can be installed at the same time List of conflict pairs was created and packages in this list were just skipped Now there is list of conflicting packages and this package will be patched first alone and rest of packages will be patched without this conflict I dropped many conflcits, most of them should be resolved by use of zypper feature since 1.14 '--force-resolution --solver-focus Update' There is separate SLE12 list becuase it's different than SLE15 and it should be out of support in near future - move the zypper version check at beginning - remove conclict from l2 l3 result check, this is still broken with conflicts - uninstall patch after conflicts and only if there are multiple patches
Required only for preinstall, conflict patch and uninstall of packages Manually resolve patch conflict with RESOLVE_PATCH_CONFLICT variable
Tomcat is no shipped to SLED 15-SP4 Don't know better solution to exclude this case, just add this condition
- added wxWidgets conflict - add solution argument to sle12_zypp_resolve and add variables for each use of this workaround - add conflict for new binaries, needed for openssh on 12sp5 combined with use of UPDATE_ADD_CONFLICT and code which will add conflict to the list via this variable - enable force-resolution feature on patch via UPDATE_PATCH_WITH_SOLVER_FEATURE - add documentation for the variables https://progress.opensuse.org/issues/155518
dzedro
changed the title
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.
https://confluence.suse.com/display/~dzedro/%5Bmaintenance%5D+update_install+test