Fix a depgraph crash with useoldpkg and subslot bumps #1322
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
This resolves a "list index out of range" error that could happen with when a package's subslot is bumped and --useoldpkg is used. Due to the subslot bump, the code will filter matched_packages to only contain the latest version. However, this didn't update matched_oldpkg, which would now contain stale packages and cause logic errors. Fix this by filtering matched_oldpkg again before its use. Signed-off-by: Tatsuyuki Ishi <ishitatsuyuki@google.com>
ishitatsuyuki
force-pushed
the
slot-oldpkg
branch
from
458f3c3
to
719d8a5
Compare
zmedico
approved these changes
May 26, 2024
| @@ -8177,6 +8177,7 @@ def _wrapped_select_pkg_highest_available_imp( | |||
| ): | |||
| return pkg, existing_node | |||
|
|
|||
| matched_oldpkg = [x for x in matched_oldpkg if x in matched_packages] | |||
| visible_matches = [] | |||
| if matched_oldpkg: | |||
| visible_matches = [ | |||
There was a problem hiding this comment.
Yes, the logic that follows is only valid when matched_oldpkg is a subset of matched_packages.
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.
This resolves a "list index out of range" error that could happen with when a package's subslot is bumped and --useoldpkg is used. (We countered this in a ChromeOS uprev.)
Due to the subslot bump, the code will filter matched_packages to only contain the latest version. However, this didn't update matched_oldpkg, which would now contain stale packages and cause logic errors.
Fix this by filtering matched_oldpkg again before its use.