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.

Sign up for GitHub

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

Jump to bottom

setup: Do not fail when pkg-config is missing #229

Merged
merged 1 commit into from
Oct 25, 2023
Merged

setup: Do not fail when pkg-config is missing #229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ jobs:
apt-get update
&& apt-get install --no-install-recommends --yes
bash binutils default-jdk-headless dpkg-dev gcc gdb iputils-ping kmod
libc6-dev pkg-config python3 python3-apt python3-distutils-extra
libc6-dev python3 python3-apt python3-distutils-extra
python3-launchpadlib python3-psutil python3-pytest python3-pytest-cov
python3-requests python3-setuptools python3-systemd valgrind
- name: Build Java subdir
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
systemd_tmpfiles_dir = subprocess.check_output(
["pkg-config", "--variable=tmpfilesdir", "systemd"], universal_newlines=True
).strip()
except subprocess.CalledProcessError:
except (FileNotFoundError, subprocess.CalledProcessError):

Check warning on line 113 in setup.py

View check run for this annotation

Codecov / codecov/patch

setup.py#L113 

Added line #L113 was not covered by tests
# hardcoded fallback path
systemd_unit_dir = "/lib/systemd/system"
systemd_tmpfiles_dir = "/usr/lib/tmpfiles.d"
Expand Down