New upstream release

- Drop patch that was applied upstream
This commit is contained in:
Simon McVittie 2021-12-13 11:39:39 +00:00
parent f5a8ff4d20
commit 61ba306e34
3 changed files with 7 additions and 32 deletions

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
ostree (2021.6-1) UNRELEASED; urgency=medium
* New upstream release
- Drop patch that was applied upstream
-- Simon McVittie <smcv@debian.org> Mon, 13 Dec 2021 11:39:08 +0000
ostree (2021.5-1) unstable; urgency=medium ostree (2021.5-1) unstable; urgency=medium
* New upstream release * New upstream release

View File

@ -1,2 +1 @@
test-commit-sign.sh-Skip-a-unit-test-when-running-as-an-i.patch
debian/Skip-test-pull-repeated-during-CI.patch debian/Skip-test-pull-repeated-during-CI.patch

View File

@ -1,31 +0,0 @@
From: Simon McVittie <smcv@debian.org>
Date: Tue, 5 Oct 2021 23:51:37 +0100
Subject: test-commit-sign.sh: Skip a unit test when running as an
installed-test
Signed-off-by: Simon McVittie <smcv@debian.org>
Forwarded: https://github.com/ostreedev/ostree/pull/2459
Applied-upstream: 2021.6, commit:92ed1857ae49a5e4d16bea345b6b5bf6671bf990
---
tests/test-commit-sign.sh | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/tests/test-commit-sign.sh b/tests/test-commit-sign.sh
index c3f9ce6..e175919 100755
--- a/tests/test-commit-sign.sh
+++ b/tests/test-commit-sign.sh
@@ -88,8 +88,12 @@ assert_file_has_content_literal show.txt 'Found 1 signature'
echo "ok pull verify"
# Run tests written in C
-${OSTREE_UNINSTALLED}/tests/test-commit-sign-sh-ext
-echo "ok extra C tests"
+if [ -n "${OSTREE_UNINSTALLED:-}" ]; then
+ ${OSTREE_UNINSTALLED}/tests/test-commit-sign-sh-ext
+ echo "ok extra C tests"
+else
+ echo "ok # SKIP test only available when running uninstalled"
+fi
# Clean things up and reinit
rm repo -rf