This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch main in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=24a7aee4631c8fb6f6482297810937f93bcc85da The following commit(s) were added to refs/heads/main by this push: new 24a7aee46 Revert "test: Pass -T+1 to xz to workaround spurious warning with xz 5.6.0" 24a7aee46 is described below commit 24a7aee4631c8fb6f6482297810937f93bcc85da (HEAD -> main) Author: Guillem Jover <[email protected]> AuthorDate: Mon Apr 29 03:47:24 2024 +0200 Revert "test: Pass -T+1 to xz to workaround spurious warning with xz 5.6.0" This reverts commit 5822b37460127d772f06a09b0acceaf87a1fec66. This got fixed in xz 5.6.1, but those two versions were backdoored anyway. New version will not emit the warnings that made the test suite fail, and we should not keep workarounds for versions that were backdoored anyway. The workaround was causing test failures on systems with older xz version where the -T+1 option form is unknown. --- src/at/deb-format.at | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/at/deb-format.at b/src/at/deb-format.at index 13654d4eb..e67ee105d 100644 --- a/src/at/deb-format.at +++ b/src/at/deb-format.at @@ -517,11 +517,8 @@ AT_SKIP_IF([! command -v xz >/dev/null]) DPKG_GEN_PKG_DEB_FORMAT_TEMPL() AT_CHECK([ # Extract the base members -# XXX: Due to a new behavior in xz 5.6.0, when it automatically reduces the -# amount of threads it prints a warning on stderr, even w/o -T. We pass an -# explicit -T+1 to force parallel mode but only use one thread as a workaround. -xz -T+1 -c control.tar >control.tar.xz -xz -T+1 -c data.tar >data.tar.xz +xz -c control.tar >control.tar.xz +xz -c data.tar >data.tar.xz ]) AT_CHECK([ -- Dpkg.Org's dpkg
