Repository navigation
common/flatpak-dir.c: fix build when HAVE_LIBSYSTEMD but not USE_SYSTEM_HELPER - #6652
Merged
Merged
Conversation
Collaborator
|
prefix should be dir then you can fit in <=72 or 80. Also can you put a Fixes: f9d5c5c ("dir: Free result of polkit_subject_to_string")? |
Contributor
Author
thanks for the review. updated. |
Collaborator
|
It should be dir: as I said. common is for when the commit touches multiple files in here. Sorry it's a bit pedantic but I mentioned it already before. |
polkit_subject_to_string() is called inside the HAVE_LIBSYSTEMD guard in flatpak_dir_log(), but <polkit/polkit.h> is only included when USE_SYSTEM_HELPER is defined. This causes a build failure on configurations that have libsystemd but no system helper. Guard the polkit call with USE_SYSTEM_HELPER and fall back to "(none)" so the subject string is always valid for the sd_journal_send() call. Fixes: f9d5c5c ("dir: Free result of polkit_subject_to_string") Signed-off-by: Rudi Heitbaum <[email protected]>
Contributor
Author
Fixed. sorry it wasn't clear - dir = directory / _dir. but happy to get it right. Thanks for the review. |
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.
polkit_subject_to_string() is called inside the HAVE_LIBSYSTEMD guard in flatpak_dir_log(), but <polkit/polkit.h> is only included when USE_SYSTEM_HELPER is defined. This causes a build failure on configurations that have libsystemd but no system helper.
Guard the polkit call with USE_SYSTEM_HELPER and fall back to "(none)" so the subject string is always valid for the sd_journal_send() call.
fixes: