This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch master in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=289dc861960b88f67e45a4a3ba4b9ee51cf3da39 commit 289dc861960b88f67e45a4a3ba4b9ee51cf3da39 Author: Guillem Jover <[email protected]> AuthorDate: Fri Nov 9 01:30:22 2018 +0100 dpkg-source: Stop filtering @builddeps@ from Testsuite-Triggers field Filtering this meta-variable means that code parsing the field is unable to know whether the source specified the build dependencies as relevant for retriggering. We should also not expand the meta-variable as that would lose information, so we let it through now. Closes: #910734 --- debian/changelog | 2 ++ man/dsc.man | 2 +- scripts/dpkg-source.pl | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9713e9b60..e34532939 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ dpkg (1.19.3) UNRELEASED; urgency=medium [ Guillem Jover ] + * dpkg-source: Stop filtering @builddeps@ from Testsuite-Triggers field. + Closes: #910734 * Perl modules: - Dpkg::Changelog::Debian: Preserve modelines at EOF. Closes: #916056 Thanks to Chris Lamb <[email protected]> for initial test cases. diff --git a/man/dsc.man b/man/dsc.man index 3fb20e3b3..c415127b3 100644 --- a/man/dsc.man +++ b/man/dsc.man @@ -160,7 +160,7 @@ This field declares the comma-separated union of all test dependencies (\fBDepends\fP fields in \fIdebian/tests/control\fP file), with all restrictions removed, and OR dependencies flattened (that is, converted to separate AND relationships), except for binaries generated by this source -package and meta-dependencies such as \fB@\fP or \fB@builddeps@\fP. +package and its meta-dependency equivalent \fB@\fP. Rationale: this field is needed because otherwise to be able to get the test dependencies, each source package would need to be unpacked. diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl index 5f553e122..32dc1c930 100755 --- a/scripts/dpkg-source.pl +++ b/scripts/dpkg-source.pl @@ -537,8 +537,8 @@ sub set_testsuite_triggers_field deps_iterate($deps, sub { $testdeps{$_[0]->{package}} = 1 }); } - # Remove our own binaries and meta-depends. - foreach my $pkg (@binarypackages, qw(@ @builddeps@)) { + # Remove our own binaries and its meta-depends variant. + foreach my $pkg (@binarypackages, qw(@)) { delete $testdeps{$pkg}; } $fields->{'Testsuite-Triggers'} = join ', ', sort keys %testdeps; -- Dpkg.Org's dpkg
