Backport 49e8bfce "system-helper: Fix deploys of local remotes" to 1.10.x #4344
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
|
A more minimal version of this would be to avoid the GMainLoop refactoring, and just backport 49e8bfc, which Milan Crha already verified on the GNOME issue. |
For updates in remotes with a local (file:) uri we just do a deploy with a LOCAL_PULL flag set and an empty arg_repo_path. However, our arg_repo_path checking at some point seemed to stop properly handling the case where it is empty. I got it to report "No such file" wich broke the tests. (cherry picked from commit 49e8bfc) Fixes: flatpak#4339
smcv
changed the title
|
I've gone with the more minimal version. We can backport the rest of #4183 if it genuinely solves a problem, but I think it was more of a cleanup then a genuine fix. |
I've verified the issue is broken before and fixed by this downstream backport, which looks identical to your PR here. So this is probably 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.
system-helper: Fix deploys of local remotes
For updates in remotes with a local (file:) uri we just do a deploy
with a LOCAL_PULL flag set and an empty arg_repo_path. However, our
arg_repo_path checking at some point seemed to stop properly handling
the case where it is empty. I got it to report "No such file" wich
broke the tests.
(cherry picked from commit 49e8bfc)
Fixes: Backport #4183 "un-revert http GMainlop change and fix hangs in the CI" to flatpak-1.10.x #4339
Tested-by: Milan Crha