Repository navigation
dir: Don't pass temp repo path to flatpak_dir_log during initial pull - #6713
Merged
Merged
Conversation
During a system install with the system helper enabled, the initial network pull goes to a temporary repo and then via pull local from that repo to the final system repo while during user install there is only one pull from network to the final repo. c672c55 set the logger to use the temporary repo path as installation but the history command afc87ad since the same day filters the initial pull out as the installation name will never match the temporary path. This causes the initial pull operation to be never show up in flatpak history when using system installs while they work for user installs as `INSTALLATION=user`. This is presumably also broken for custom installations as they will similarly not match the temp repo path. So don't pass the path at all to flatpak_dir_log and we can later fall back via flatpak_dir_get_name_cached() which sets the correct `INSTALLATION` for system installs ie. `INSTALLATION=system`. This also allows us to remove the workaround of adding two different expected history outputs from ad1ff6d as both branches log the pull. Without system helper `flatpak install` needs to be executed as priviledged to operate on system install so the initial pull was always logged correctly for that branch.
bbhtt
force-pushed
the
bbhtt/log-system-pulls
branch
from
June 19, 2026 02:39
3aca69e to
98e8d84
Compare
Collaborator
Author
|
I checked system installs now show the pull in history command after this, haven't checked custom installations but I assume they should be ok too. |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
During a system install with the system helper enabled, the initial network pull goes to a temporary repo and then via pull local from that repo to the final system repo while during user install there is only one pull from network to the final repo.
c672c55 set the logger to use the temporary repo path as installation but the history command afc87ad since the same day filters the initial pull out as the installation name will never match the temporary path.
This causes the initial pull operation to be never show up in flatpak history when using system installs while they work for user installs as
INSTALLATION=user.This is presumably also broken for custom installations as they will similarly not match the temp repo path.
So don't pass the path at all to flatpak_dir_log and we can later fall back via flatpak_dir_get_name_cached() which sets the correct
INSTALLATIONfor system installs ie.INSTALLATION=system.This also allows us to remove the workaround of adding two different expected history outputs from ad1ff6d as both branches log the pull.
Without system helper
flatpak installneeds to be executed as priviledged to operate on system install so the initial pull was always logged correctly for that branch.