package dpkg-dev
retitle 235266 [DPKG-CHECKBUILDDEPS][TRIVIAL] should distinguish build-depends from build-conflicts
tags 235266 patch
thanks
On Sun, 2004-02-29 at 21:43, Devin Carraway wrote:
> On Sun, Feb 29, 2004 at 09:00:40PM +0000, Scott James Remnant wrote:
> > How irritating; what would a better wording be?
>
> I'd suggest "Unsatisfied build dependencies" and "Unsatisfied build
> conflicts." It doesn't cover the singular/plural mismatch, but neither
> does the current wording, and the script shouldn't introduce such a
> silly obstacle to machine-parsability.
>
I've been looking at the code and it already includes the following:
if (@conflicts) {
print STDERR "$me: Build conflicts: ";
print STDERR join(" ", @conflicts), "\n";
}
But in the 1.10 branch, @conflicts never gets set to anything.
Strangely the code on trunk *does* set @conflicts correctly, and judging
by "blame" output, has done since 1.9.x. It actually looks like a copy
and paste error, so the attached patch would revert this behaviour back.
Scott
--
Have you ever, ever felt like this?
Had strange things happen? Are you going round the twist?
Index: scripts/dpkg-checkbuilddeps.pl
===================================================================
--- scripts/dpkg-checkbuilddeps.pl (revision 1844)
+++ scripts/dpkg-checkbuilddeps.pl (revision 1845)
@@ -44,13 +44,13 @@
push @unmet, build_depends(parsedep($fi{"C Build-Depends"}, 1, 1), @status);
}
if (defined($fi{"C Build-Conflicts"})) {
- push @unmet, build_conflicts(parsedep($fi{"C Build-Conflicts"}, 1, 1), @status);
+ push @conflicts, build_conflicts(parsedep($fi{"C Build-Conflicts"}, 1, 1), @status);
}
if (! $binary_only && defined($fi{"C Build-Depends-Indep"})) {
push @unmet, build_depends(parsedep($fi{"C Build-Depends-Indep"}, 1, 1), @status);
}
if (! $binary_only && defined($fi{"C Build-Conflicts-Indep"})) {
- push @unmet, build_conflicts(parsedep($fi{"C Build-Conflicts-Indep"}, 1, 1), @status);
+ push @conflicts, build_conflicts(parsedep($fi{"C Build-Conflicts-Indep"}, 1, 1), @status);
}
if (@unmet) {
Index: ChangeLog
===================================================================
--- ChangeLog (revision 1844)
+++ ChangeLog (revision 1845)
@@ -1,3 +1,9 @@
+Sun Feb 29 21:56:25 GMT 2004 Scott James Remnant <scott@netsplit.com>
+
+ * scripts/dpkg-checkbuilddeps.pl: Push build-conflicts errors into
+ @conflicts instead of @unmet, this looks like an accidental error
+ introduced by bad copy&pasteing.
+
Thu Feb 26 01:48:15 GMT 2004 Scott James Remnant <scott@netsplit.com>
* main/processarc.c (process_archive): Copy code from main/remove.c
Attachment:
signature.asc
Description: This is a digitally signed message part