From 7b9284d2e4e5015298d67e2f22c19cf8cec1c320 Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Mon, 5 Oct 2020 19:45:41 +0200 Subject: build.sh: use sbuild/lintian integration Since upgrading from stretch to buster, the lintian integration actually works. Rely on it. --- build.sh | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/build.sh b/build.sh index b5f1cb4..c669dd2 100755 --- a/build.sh +++ b/build.sh @@ -30,8 +30,8 @@ $bd_uninstallable_explainer = "apt"; $source_only_changes = 0; $apt_update = 1; $apt_distupgrade = 1; -$lintian_opts = ["-T", "binary-from-other-architecture,triplet-dir-and-architecture-mismatch"]; -#$lintian_require_success = 1; +$lintian_opts = ["-T", "binary-from-other-architecture,triplet-dir-and-architecture-mismatch", "--fail-on", "error"]; +$lintian_require_success = 1; $run_lintian = 1; $run_autopkgtest = 0; $run_piuparts = 0; @@ -43,10 +43,6 @@ sbuild "--host=$HOST_ARCH" "$PACKAGE" >/dev/null || RET=$? for f in *.build; do test -L "$f" && continue test -f "$f" || continue - # poor substitute for missing $lintian_require_success. - if tail -n20 "$f" | grep -q "^Lintian: fail$"; then - RET=1 - fi xz -9c "$f" done exit "$RET" -- cgit v1.2.3