Skip to content
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

Port install-lib fixes from toltec #49

Merged
merged 4 commits into from
May 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[project]
name = "toltecmk"
version = "0.3.1"
version = "0.3.2"
authors = [
{ name="Mattéo Delabre", email="[email protected]" },
{ name="Eeems", email="[email protected]" },
Expand Down
2 changes: 1 addition & 1 deletion toltec/hooks/install_lib.py
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ def post_package(
)
add_method(
"unit-exists",
'[ "$(systemctl --quiet list-unit-files "${1}" | grep -c "${1}")" -eq 1 ]',
'[ "$(systemctl --quiet list-unit-files "${1}" | /bin/grep -c "${1}" 2> /dev/null)" -eq 1 ]', # pylint: disable=line-too-long
)
add_method(
"disable-unit",
Expand Down
3 changes: 2 additions & 1 deletion toltecmk.spec
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ a = Analysis(
pathex=[],
binaries=[],
datas=[],
hiddenimports=[f"toltec.hooks.{x}" for x in toltec.hooks.__all__],
hiddenimports=[f"toltec.hooks.{x}" for x in toltec.hooks.__all__]
+ ["pkg_resources.extern"],
hookspath=[],
hooksconfig={},
runtime_hooks=[],
Expand Down