fix: Allow to build with autostart and without systemd feature #137
Open
vadorovsky wants to merge 2 commits intopop-os:masterfrom
Open
fix: Allow to build with autostart and without systemd feature #137vadorovsky wants to merge 2 commits intopop-os:masterfrom
autostart and without systemd feature #137vadorovsky wants to merge 2 commits intopop-os:masterfrom
Conversation
vadorovsky
changed the title
is_systemd_used only if the systemd feature is enabledis_systemd_used only if the systemd feature is enabled
vadorovsky
force-pushed
the
fix-autostart-no-systemd
branch
from
233dac3 to
4eb13ae
Compare
Author
|
I proposed a GitHub workflow in a separate commit. It aims to run builds and tests with all feature combinations. Let me know if you agree with such approach. Unfortunately, it looks like it's not actually running. Perhaps it needs some permissions enabled in the repository settings. |
Before this change, import of `systemd::is_systemd_used` was hidden behind `cfg(feature = "systemd")` predicate. But that function is expected to be present in the autostart block even if `systemd` feature is disabled. Fix that by importing `is_systemd_used` unconditionally. Provide an implementation of `is_systemd_used` for `cfg(not(feature = "systemd"))` which just returns `false`. Fixes: pop-os#136
vadorovsky
force-pushed
the
fix-autostart-no-systemd
branch
from
4eb13ae to
4d4ef0d
Compare
vadorovsky
changed the title
is_systemd_used only if the systemd feature is enabledautostart and without systemd feature
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
1 participant
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.
Before this change, import of
systemd::is_systemd_usedwas hidden behindcfg(feature = "systemd")predicate. But that function is expected to be present in the autostart block even ifsystemdfeatureis disabled.
Fix that by importing
is_systemd_usedunconditionally.Provide an implementation of
is_systemd_usedforcfg(not(feature = "systemd"))which just returnsfalse.Fixes: #136