Bug#879798: FTBFS: testsuite fails with dpkg 1.19, patch attached

2017-10-27 Thread Mattia Rizzolo 
On Fri, Oct 27, 2017 at 04:49:44AM +, Adam Conrad wrote:
> I'd suggest that this commit already makes no-delta backports somewhat
> problematic:
> 
> https://anonscm.debian.org/git/collab-maint/devscripts.git/commit/?id=921696fd6c92c4299accb1e2ef1ae48d13a47b0d

Well, that doesn't stop backports to stretch, which is pretty much what
I'm interested about.

> But ignoring that for a moment, how about this patch instead (tested
> against dpkg 1.18.24ubuntu1 and 1.19.0.4ubuntu1):

That does it.
I committed something very similar now (albeit I haven't tested it, but
why wouldn't it work)

-- 
regards,
Mattia Rizzolo

GPG Key: 66AE 2B4A FCCF 3F52 DA18  4D18 4B04 3FCD B944 4540  .''`.
more about me:  https://mapreri.org : :'  :
Launchpad user: https://launchpad.net/~mapreri  `. `'`
Debian QA page: https://qa.debian.org/developer.php?login=mattia  `-


signature.asc
Description: PGP signature

Bug#879798: FTBFS: testsuite fails with dpkg 1.19, patch attached

2017-10-26 Thread Adam Conrad 
On Thu, Oct 26, 2017 at 08:59:23PM +0200, Mattia Rizzolo wrote:
> On Wed, Oct 25, 2017 at 10:40:20PM -0600, Adam Conrad wrote:
> 
> We like to backport devscripts, and I'd rather not have backports deltas
> if possible...

I'd suggest that this commit already makes no-delta backports somewhat
problematic:

https://anonscm.debian.org/git/collab-maint/devscripts.git/commit/?id=921696fd6c92c4299accb1e2ef1ae48d13a47b0d

But ignoring that for a moment, how about this patch instead (tested
against dpkg 1.18.24ubuntu1 and 1.19.0.4ubuntu1):

diff -Nru devscripts-2.17.10/test/test_mk-origtargz 
devscripts-2.17.10ubuntu2/test/test_mk-origtargz
--- devscripts-2.17.10/test/test_mk-origtargz   2017-09-13 20:08:30.0 
-0600
+++ devscripts-2.17.10ubuntu2/test/test_mk-origtargz2017-10-26 
22:38:49.0 -0600
@@ -26,6 +26,12 @@
 PROGNAME="mk-origtargz.pl"
 fi
 
+if dpkg --compare-versions $(dpkg-query -W -f='${Version}' libdpkg-perl) lt 
1.19.0~; then
+SUBPROCESS_ERROR="gave error exit status 2"
+else
+SUBPROCESS_ERROR="subprocess returned exit status 2"
+fi
+
 cleanup(){
rm -rf $TMPDIR
unset LC_ALL
@@ -540,7 +546,7 @@
"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
 }

... Adam

Bug#879798: FTBFS: testsuite fails with dpkg 1.19, patch attached

2017-10-26 Thread Mattia Rizzolo 
On Wed, Oct 25, 2017 at 10:40:20PM -0600, Adam Conrad wrote:
> In Ubuntu, the attached patch was applied to achieve the following:
> 
>   * test/test_mk-origtargz: Adjust test for dpkg 1.19's ErrorHandling.pm.
> 
> Fairly self-explanatory, I'd think.  In dpkg 1.19, ErrorHandling.pm was
> normalised to match libdpkg error messages, and this means the expected
> error in the mk-origtargz test is now incorrect.  This patch fixes that.

We like to backport devscripts, and I'd rather not have backports deltas
if possible...

But yes, a bug damn :)

-- 
regards,
Mattia Rizzolo

GPG Key: 66AE 2B4A FCCF 3F52 DA18  4D18 4B04 3FCD B944 4540  .''`.
more about me:  https://mapreri.org : :'  :
Launchpad user: https://launchpad.net/~mapreri  `. `'`
Debian QA page: https://qa.debian.org/developer.php?login=mattia  `-


signature.asc
Description: PGP signature

Bug#879798: FTBFS: testsuite fails with dpkg 1.19, patch attached

2017-10-25 Thread Adam Conrad 
Package: devscripts
Version: 2.17.10
Severity: serious
Tags: patch
Justification: fails to build from source (but built successfully in the past)
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu bionic ubuntu-patch



In Ubuntu, the attached patch was applied to achieve the following:

  * test/test_mk-origtargz: Adjust test for dpkg 1.19's ErrorHandling.pm.

Fairly self-explanatory, I'd think.  In dpkg 1.19, ErrorHandling.pm was
normalised to match libdpkg error messages, and this means the expected
error in the mk-origtargz test is now incorrect.  This patch fixes that.

... Adam

-- System Information:
Debian Release: buster/sid
  APT prefers bionic
  APT policy: (500, 'bionic')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.13.0-16-lowlatency (SMP w/4 CPU cores; PREEMPT)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_CA:en (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru devscripts-2.17.10/test/test_mk-origtargz 
devscripts-2.17.10ubuntu1/test/test_mk-origtargz
--- devscripts-2.17.10/test/test_mk-origtargz   2017-09-13 20:08:30.0 
-0600
+++ devscripts-2.17.10ubuntu1/test/test_mk-origtargz2017-10-25 
22:29:09.0 -0600
@@ -540,7 +540,7 @@
"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 returned exit status 2" \
"" \
 ../foo-0.1.tar.gz --repack --compression xz
 }