File conflict callbacks #452
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
| @@ -2759,6 +2854,13 @@ def SetProgressReportCallbacks | |||
| nil | |||
| end | |||
|
|
|||
| def SetFileConflictsCallbacks | |||
| Pkg.CallbackFileConflictStart(fun_ref(method(:FileConflictStart), "void ()")) | |||
| Pkg.CallbackFileConflictProgress(fun_ref(method(:FileConflictProgress), "boolean (intreger)")) | |||
lslezak
force-pushed
the
file_conflict_callbacks
branch
from
0ba80c5
to
2c82b7d
Compare
| def FileConflictProgress(progress) | ||
| log.debug "File conflict progress: #{progress}%" | ||
|
|
||
| sleep(1) |
There was a problem hiding this comment.
FIXME remove before merging
|
|
||
| module Packages | ||
| # Default file conflicts callbacks for package bindings. To register the | ||
| # callbacks in Yast::Pkg just call {Package::FileConflictCallbacks.register} |
|
Looks good, only version + changelog missing. |
|
|
||
| - Display a confirmation dialog when a file conflict is detected | ||
| during package installation (bsc#923590) | ||
| - 3.1.180 |
There was a problem hiding this comment.
Conflict in a conflict PR!!1!
|
(I have removed an extra blank line in .changes) LGTM, thank you! |
lslezak
force-pushed
the
file_conflict_callbacks
branch
from
1fccb57
to
22c9857
Compare
|
JFYI: I have squashed the commits to have a clean history. |
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.
Handle File Conflicts in Packages
A sample repository with testing packages that have file conflicts is obs://YaST:testing.
Note: The new added file has 100% test code coverage 馃槈
Background (for the Blog)
Until now the package installation in YaST ignored possible file conflicts in the installed packages. In contrast
zypperalready supports that check for some time.File conflicts happen when two packages attempt to install files with the same name but different contents. If such conflicting packages are installed the conflicting files will be replaced losing the previous content. The final file content will also depend on the installation order so some issues might look "random". The package which file has been overwritten is actually broken.
YaST now displays a confirmation dialog which asks whether to continue with installation despite the conflicts or abort. Previously YaST silently continued with the package installation which could cause serious troubles later.
File conflicts should normally not happen, at least when you use the original distribution repositories. The OBS build checks for some file conflicts during package build and if there really is a file conflict that it should be marked on the RPM level (so you should not be allowed to select the conflicting packages for installation at first place).
It is up to the user to decide whether it is OK to ignore the conflict or not. If the conflict is for example in a documentation file then ignoring the conflict is usually no problem, but if the conflict is in a binary file or in a system library then it is potentially risky. If you are not sure "Abort" is the safe choice here.
Screencasts
(Click an image to display it in full size.)
Qt GUI
In this demo there is a
sleep()call used in the progress dialog to make the progress visible, in real installation it will be much faster. The Packman packages were added just to have more progress steps. The "Actions performed" log is empty as the packages were cached locally from the previous attempts. 馃槈NCurses UI
Again, the progress contains
sleep()to make it visible.Command Line Mode
The yast2-dhcp-server package has been manually modified to install the conflicting packages beside the usual
dhcp-serverpackage. In the command line mode the conflicts are ignored and the packages are installed without asking.Installing Extra Packages at Runtime
Some modules install missing packages when the module is started. In this case I patched the
dhcp-servermodule to additionally install the conflicting packages.