From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 7 Jun 2015 12:42:50 +0000 (+0100)
Subject: Test suite: Prepare for pipefail in t-apply-diff
X-Git-Tag: debian/0.30~105
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=d05936fa35e8fccc8b9eead88379fcdaa2021277

Test suite: Prepare for pipefail in t-apply-diff
---

diff --git a/tests/lib b/tests/lib
index 0ae9bbc2..e960c1c6 100644
--- a/tests/lib
+++ b/tests/lib
@@ -370,8 +370,9 @@ t-ref-dsc-dgit () {
 t-apply-diff () {
 	local v1=$1
 	local v2=$2
-	(cd $troot/pkg-srcs; debdiff ${p}_${v1}.dsc ${p}_${v2}.dsc) \
-		| patch -p1 -u
+	(cd $troot/pkg-srcs;
+	 debdiff ${p}_${v1}.dsc ${p}_${v2}.dsc || test $? = 1) \
+	 | patch -p1 -u
 }
 
 t-commit () {