Skip to content

Commit a4952e3

Browse files
authored
Port install-lib fixes from toltec (#49)
* Port install-lib fixes from toltec * Bump version number * Fix building on python 3.12
1 parent d44f66a commit a4952e3

3 files changed

Lines changed: 4 additions & 3 deletions

File tree

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[project]
22
name = "toltecmk"
3-
version = "0.3.1"
3+
version = "0.3.2"
44
authors = [
55
{ name="Mattéo Delabre", email="git.matteo@delab.re" },
66
{ name="Eeems", email="eeems@eeems.email" },

toltec/hooks/install_lib.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ def post_package(
180180
)
181181
add_method(
182182
"unit-exists",
183-
'[ "$(systemctl --quiet list-unit-files "${1}" | grep -c "${1}")" -eq 1 ]',
183+
'[ "$(systemctl --quiet list-unit-files "${1}" | /bin/grep -c "${1}" 2> /dev/null)" -eq 1 ]', # pylint: disable=line-too-long
184184
)
185185
add_method(
186186
"disable-unit",

toltecmk.spec

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ a = Analysis(
77
pathex=[],
88
binaries=[],
99
datas=[],
10-
hiddenimports=[f"toltec.hooks.{x}" for x in toltec.hooks.__all__],
10+
hiddenimports=[f"toltec.hooks.{x}" for x in toltec.hooks.__all__]
11+
+ ["pkg_resources.extern"],
1112
hookspath=[],
1213
hooksconfig={},
1314
runtime_hooks=[],

0 commit comments

Comments
 (0)