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

[SCM] Debian package checker branch, master, updated. 1.24.2-66-g6495721



The following commit has been merged in the master branch:
commit 6495721b0b7b31ae3df396baf235ead0664b944c
Author: Adam D. Barratt <adam@adam-barratt.org.uk>
Date:   Thu Jul 31 23:13:23 2008 +0100

    Use Lintian::Collect::index in the metapackage check

diff --git a/checks/fields b/checks/fields
index 72f4d58..87037a7 100644
--- a/checks/fields
+++ b/checks/fields
@@ -399,15 +399,10 @@ if (defined $info->field('installer-menu-item')) {
 my $metapackage = 0;
 if ($type eq 'binary' && $arch_indep) {
 	$metapackage = 1;
-	open (IN, '<', "index") or fail("cannot open index file index: $!");
-	local $_;
-	local $/ = "\n";
-	while (<IN>) {
-		my ($mode, $file) = (split(' ', $_, 6))[0,5];
-		next unless $file;
-		$metapackage = 0 unless ($mode =~ /^d/ || $file =~ m%^\./usr/share/doc/%);
+	foreach my $file (keys %{$info->{index}}) {
+		$metapackage = 0 unless ($info->{index}->{$file}->{type} =~ /^d/
+		    || $file =~ m%^usr/share/doc/%);
 	}
-	close IN;
 }
 if (($type eq "binary") || ($type eq 'udeb')) {
 	my (%deps, %fields, %parsed);

-- 
Debian package checker


Reply to: