The following commit has been merged in the master branch:
commit 00f0e3d88d71cfe59878d68bccf73388f804612b
Author: Niels Thykier <[email protected]>
Date: Thu Apr 12 19:01:07 2012 +0200
c/control-file: Rewrite loop
Signed-off-by: Niels Thykier <[email protected]>
diff --git a/checks/control-file b/checks/control-file
index 5a87c6d..083b45e 100644
--- a/checks/control-file
+++ b/checks/control-file
@@ -22,6 +22,8 @@ package Lintian::control_file;
use strict;
use warnings;
+use List::Util qw(first);
+
use Lintian::Data ();
use Lintian::Relation ();
use Lintian::Tags qw(tag);
@@ -101,13 +103,13 @@ if ($@) {
my @package_names = sort keys %{ $info->binaries };
-for my $binary_control (@binary_controls) {
- tag 'build-info-in-binary-control-file-section', 'Package
'.$binary_control->{'package'}
- if ($binary_control->{'build-depends'} ||
$binary_control->{'build-depends-indep'} ||
- $binary_control->{'build-conflicts'} ||
$binary_control->{'build-conflicts-indep'});
- for my $field (keys %$binary_control) {
- tag 'binary-control-field-duplicates-source', "field \"$field\" in
package ".$binary_control->{'package'},
- if ($header->{$field} && $binary_control->{$field} eq
$header->{$field});
+foreach my $bin (@package_names) {
+ my $bfields = $info->binary_field ($bin);
+ tag 'build-info-in-binary-control-file-section', "Package $bin"
+ if (first { $bfields->{"build-$_"} } qw(depends depends-indep
conflicts conflicts-indep) );
+ foreach my $field (keys %$bfields) {
+ tag 'binary-control-field-duplicates-source', "field \"$field\" in
package $bin"
+ if ($info->source_field ($field) && $bfields->{$field} eq
$info->source_field ($field));
}
}
--
Debian package checker
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
