-
Notifications
You must be signed in to change notification settings - Fork 11
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 missing Flatpaks gracefully #135
Merged
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
Yes, this is harder to read, but I'm about to add error handling that would otherwise be duplicated. https://phabricator.endlessm.com/T34603
Previously, if a listed Flatpak app or runtime is not present in that remote, remote.match() would return None, but the calling code would assume it is not None. This leads to a failure like this: + 20:16:29 INFO eibflatpak: Looking for app ref "com.orama_interactive.Pixelorama" match in flathub + 20:16:29 INFO eibflatpak: Removing repo option core.xa.languages + 20:16:29 INFO eibflatpak: Removing repo option core.xa.extra-languages + 20:16:29 INFO eibflatpak: Removing repo option core.xa.masked Traceback (most recent call last): File "/tmp/image-build-IZAJlTeyep/eos-image-builder/hooks/content/50-flatpak", line 61, in <module> manager.pull() File "/tmp/image-build-IZAJlTeyep/eos-image-builder/lib/eibflatpak.py", line 837, in pull txn = self._new_transaction() File "/tmp/image-build-IZAJlTeyep/eos-image-builder/lib/eibflatpak.py", line 808, in _new_transaction self._add_installs(txn) File "/tmp/image-build-IZAJlTeyep/eos-image-builder/lib/eibflatpak.py", line 799, in _add_installs logger.info('Adding app %s from %s', ref.ref, remote.name) AttributeError: 'NoneType' object has no attribute 'ref' Handle this gracefully, collecting all errors in case more than one Flatpak is missing, then fail at the end. https://phabricator.endlessm.com/T34603
Draft because totally untested. |
dbnicholson
approved these changes
Nov 30, 2023
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good to me! I'd be comfortable merging this as is if you don't have time to test.
Tested this with 1 found and 2 not-found refs, it looks good:
|
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.
Previously, if a listed Flatpak app or runtime is not present in that
remote, remote.match() would return None, but the calling code would
assume it is not None. This leads to a failure like this:
Handle this gracefully, collecting all errors in case more than one
Flatpak is missing, then fail at the end.
https://phabricator.endlessm.com/T34603