This is an automated email from the git hooks/post-receive script. mattia pushed a commit to branch master in repository devscripts.
commit 96030dac7ca3f9e70ade3970ca30afe3f1df9c14 Author: Mattia Rizzolo <[email protected]> Date: Fri Oct 27 11:09:34 2017 +0200 tests/mk-origtargz: fix check with dpkg 1.19.x The error message changed between 1.18 and 1.19. Gbp-Dch: Short Closes: #879798 Thanks: Adam Conrad <[email protected]> for the patch Signed-off-by: Mattia Rizzolo <[email protected]> --- debian/changelog | 3 +++ test/test_mk-origtargz | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 758670a..c312f5d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -55,6 +55,9 @@ devscripts (2.17.11) UNRELEASED; urgency=medium * uscan: + Apply patch from Stephen Kitt <[email protected]> to support https in the sf.net special redirector. Closes: #879207 + * tests: + + mk-origtargz: fix check with dpkg 1.19.x. Thanks to Adam Conrad + <[email protected]> for the patch. Closes: #879798 -- Chris Lamb <[email protected]> Wed, 27 Sep 2017 13:24:39 +0100 diff --git a/test/test_mk-origtargz b/test/test_mk-origtargz index a4eaf06..5508d78 100755 --- a/test/test_mk-origtargz +++ b/test/test_mk-origtargz @@ -536,11 +536,16 @@ testCopyrightFormatWarning() { testBrokenTarWarning() { makeBrokenTarBall makeDebianDir + if dpkg --compare-versions $(dpkg-query -W -f='${Version}' libdpkg-perl) lt 1.19.0~; then + local SUBPROCESS_ERROR="gave error exit status 2" + else + local SUBPROCESS_ERROR="subprocess returned exit status 2" + fi run_mk_origtargz foo \ "tar: This does not look like a tar archive tar: Skipping to next header tar: Exiting with failure status due to previous errors -$PROGNAME: error: tar --list --auto-compress --file ../foo_0.1.orig.tar.xz gave error exit status 2" \ +$PROGNAME: error: tar --list --auto-compress --file ../foo_0.1.orig.tar.xz $SUBPROCESS_ERROR" \ "" \ ../foo-0.1.tar.gz --repack --compression xz } -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git _______________________________________________ devscripts-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/devscripts-devel
