diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-11 16:59:11 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-11 16:59:11 +0000 |
| commit | 280b5dfabd47affd65b4167285d5e7c76440252c (patch) | |
| tree | c863ffe867124b6db907bdb019610c959937bc9c | |
| parent | Merging upstream version 0.85.10. (diff) | |
| download | sbuild-280b5dfabd47affd65b4167285d5e7c76440252c.tar.xz sbuild-280b5dfabd47affd65b4167285d5e7c76440252c.zip | |
Merging debian version 0.85.10.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/tests/build-procenv | 4 | ||||
| -rw-r--r-- | debian/tests/control | 2 |
3 files changed, 11 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index afbd114..009bb49 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +sbuild (0.85.10) unstable; urgency=medium + + * autopkgtest: skip test for unreleased architecture + + -- Jochen Sprickerhof <jspricke@debian.org> Thu, 30 May 2024 10:41:26 +0200 + sbuild (0.85.9-0.0~progress7.99u1) graograman-backports; urgency=medium * Uploading to graograman-updates, remaining changes: diff --git a/debian/tests/build-procenv b/debian/tests/build-procenv index 73f7e25..1074184 100644 --- a/debian/tests/build-procenv +++ b/debian/tests/build-procenv @@ -112,6 +112,10 @@ if [ -z "$http_proxy" ]; then fi echo "INFO: Creating sbuild chroot '$chroot' for release '$release' in directory '$dir' from url '$url'" + +# Test if there is actually a release for that architecture +wget --quiet --spider "$url/dists/$release/main/binary-$arch/Release" || exit 77 + [ -n "$components" ] && components="--components=$components" # avoid "debconf: delaying package configuration, since apt-utils is not installed" runuser -u "$AUTOPKGTEST_NORMAL_USER" -- sudo sbuild-createchroot $components "$release" "$dir" "$url" diff --git a/debian/tests/control b/debian/tests/control index a0f720a..5ba839b 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -1,5 +1,5 @@ Tests: build-procenv -Depends: apt (>= 1.1~exp2), apt-utils, debootstrap, distro-info, lsb-release, sudo, @ +Depends: apt (>= 1.1~exp2), apt-utils, debootstrap, distro-info, lsb-release, sudo, wget, @ Restrictions: needs-root skippable Tests: unshare |