Skip to content

Commit f529745

Browse files
committed
tools: Fix Debian --build={all,any} FTBFS
Commit 5d70a2a moved cockpit-bridge to "Architecture: all", so we cannot run the package pytest in `dh_install-arch` any more as the package isn't build there. Move it to `-indep` instead. Taken from downstream: https://salsa.debian.org/utopia-team/cockpit/-/commit/6587a3326
1 parent 6b9175d commit f529745

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

tools/debian/rules

+1-2
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,7 @@ execute_after_dh_install-indep:
7676
# avoid dh_missing failure
7777
rm -r debian/tmp/usr/lib/python*
7878

79-
# run pytests *after* installation, so that we can make sure that we installed the right files
80-
execute_after_dh_install-arch:
79+
# run pytests *after* installation, so that we can make sure that we installed the right files
8180
ifeq (, $(findstring nocheck, $(DEB_BUILD_OPTIONS)))
8281
ifeq ($(shell . /etc/os-release; echo $${VERSION_ID:-unstable}),22.04)
8382
NO_QUNIT=1 PYTHONPATH=$$(ls -d debian/cockpit-bridge/usr/lib/python3*/dist-packages) python3 -m pytest -vv -k 'not linter and not test_descriptions'

0 commit comments

Comments
 (0)