From e954d2be4e0e2b451f8da2bbd8d57afc5be58895 Mon Sep 17 00:00:00 2001
From: Arnaud Ferraris <arnaud.ferraris@collabora.com>
Date: Tue, 16 Mar 2021 18:26:14 +0100
Subject: [PATCH] ci-buildpackage: use wrap-and-sort as a workaround for odd
 packages

A lot of `node-*` packages have their Build-Depends formatted in a way
apt can't parse, causing CI failures.

Using wrap-and-sort beforehand in order to make sure the file format is
correct will help working around these issues.

Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com>
---
 package-source-builder/overlay/usr/bin/ci-buildpackage | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/package-source-builder/overlay/usr/bin/ci-buildpackage b/package-source-builder/overlay/usr/bin/ci-buildpackage
index 802b7b5..ee79cba 100755
--- a/package-source-builder/overlay/usr/bin/ci-buildpackage
+++ b/package-source-builder/overlay/usr/bin/ci-buildpackage
@@ -11,11 +11,17 @@ set -ex
 
 export DEBIAN_FRONTEND=noninteractive
 
+# Works around node-* packages having Build-Depends apt can't parse
+wrap-and-sort
+
 apt-get -qy update
 apt-get -qy -o APT::Get::Build-Dep-Automatic=yes \
   -o Acquire::http::Pipeline-Depth=0 \
   build-dep "$(pwd)"
 
+# Revert changes made by `wrap-and-sort`
+git restore debian
+
 dpkg-checkbuilddeps
 
 dversion="$(dpkg-parsechangelog -S Version)"
-- 
GitLab