[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#986835: [pre-approval] unblock: dpkg/1.20.8



Control: retitle -1 [pre-approval] unblock: dpkg/1.20.9
Control: tag -1 - moreinfo

Hi!

On Tue, 2021-04-13 at 20:22:46 +0200, Ivo De Decker wrote:
> On Tue, Apr 13, 2021 at 08:13:10PM +0200, Guillem Jover wrote:
> > On Tue, 2021-04-13 at 17:58:08 +0200, Guillem Jover wrote:
> > > On Tue, 2021-04-13 at 15:36:08 +0200, Ivo De Decker wrote:
> > > > Please go ahead with the upload and remove the moreinfo tag from this bug when
> > > > the new version is in unstable.
> > > 
> > > Thanks! I'm targeting an upload for later today, but I was thinking I
> > > might try to quickly produce a tiny functional test for the
> > > auto-deconfigure bug. I'll update the report once I get that, and I
> > > could hold the upload until you approve that, but I'm not sure that's
> > > worth the round-trip, given that it's a test? :)
> > 
> > Ok, this was actually trivial, as it was pretty much like the existing
> > t-breaks test case but with Protected/Essential:yes added to the broken
> > packages.
> > 
> > Attached updated patch, including test case and ref.
> 
> I don't know if you're expecting an explicit ack on the extra test as well,
> but if you do: please go ahead and include the test :)

And arf, sorry, one of the changes to make the test suite more portable
ended up triggering a mass FTBFS. :/ I guess it was a problem waiting to
happen anyway, but… The attached patch fixes this, and I've uploaded now
dpkg 1.20.9.

For the future I'll probably update my release script to build in a
non-amd64 system too, or choose a fake arch different from the current
one to always spot this kind of problem in 1.21.x.

Thanks,
Guillem
From 7719a3aab135d904d3c43f7958415604f41e7d47 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Wed, 14 Apr 2021 00:34:18 +0200
Subject: [PATCH] test: Pass --ignore-builtin-builddeps to dpkg-buildpackage

We should ignore any builtin build dependencies (in particular
build-essential, which is an arch:any package), as we are forcing the
build and host architectures, which will make them not match whatever
is on the system status file if present at all, and cause dependency
unsatisfiability.

Fixes: commit 0e2ae4e706e816a9ce200bb506674d19af25a55f
---
 scripts/t/dpkg_buildpackage.t | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/t/dpkg_buildpackage.t b/scripts/t/dpkg_buildpackage.t
index d529eb69c..47c6e184b 100644
--- a/scripts/t/dpkg_buildpackage.t
+++ b/scripts/t/dpkg_buildpackage.t
@@ -187,6 +187,7 @@ sub test_build
     chdir $dirname;
     spawn(exec => [ $ENV{PERL}, "$srcdir/dpkg-buildpackage.pl",
                     '--host-arch=amd64',
+                    '--ignore-builtin-builddeps',
                     '--unsigned-source', '--unsigned-changes',
                     '--unsigned-buildinfo',
                     "--build=$typename", '--check-command=' ],
-- 
2.31.0


Reply to: