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

[SCM] Debian package checker branch, master, updated. 1.24.2-31-g731e966



The following commit has been merged in the master branch:
commit 731e966f0402229265d4c5a4ad8f9eb0c6df19da
Author: Adam D. Barratt <adam@adam-barratt.org.uk>
Date:   Fri Jul 25 02:10:41 2008 +0100

    [ADB] Migrate fields/* reading to use ::Collect::field().

diff --git a/checks/patch-systems b/checks/patch-systems
index 6b00eca..8a28e0e 100644
--- a/checks/patch-systems
+++ b/checks/patch-systems
@@ -28,7 +28,7 @@ use Tags;
 use Util;
 
 sub run {
-	my ($pkg, $type) = @_;
+	my ($pkg, $type, $info) = @_;
 
 	unless (-d "fields") {
     	fail("directory in lintian laboratory for $type package $pkg missing: fields");
@@ -40,24 +40,18 @@ sub run {
 	#Get build deps so we can decide which build system the maintainer
 	#meant to use:
 	my $build_deps = "";
-    if (open(IN, '<', "fields/build-depends")) {
-		local $/ = undef;
-        chomp($build_deps .= <IN>);
-		close(IN);
-    }
-	if (open(IN, '<', "fields/build-depends-indep")) {
-		local $/ = undef;
+	if (defined $info->field('build-depends')) {
+		$build_deps = $info->field('build-depends');
+	}
+	if (defined $info->field('build-depends-indep')) {
 		$build_deps .= ", " if $build_deps;
-		chomp($build_deps .= <IN>);
-		close(IN);
+		$build_deps .= $info->field('build-depends-indep');
 	}
 	$build_deps = Dep::parse($build_deps);
 	# Get source package format
 	my $format = "";
-	if (open(IN, '<', "fields/format")) {
-		local $/ = undef;
-		chomp($format .= <IN>);
-		close(IN);
+	if (defined $info->field('format')) {
+		$format = $info->field('format');
 	}
 	my $quilt_format = ($format =~ /3\.\d+ \(quilt\)/) ? 1 : 0;
 
diff --git a/debian/changelog b/debian/changelog
index 59ce049..97f873a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -37,6 +37,7 @@ lintian (1.24.3) unstable; urgency=low
       into a single message to reduce the noise from packages that rebuild
       all auto-generated files outside the patch system.  Thanks, Julien
       Cristau.  (Closes: #491296)
+    + [ADB] Migrate fields/* reading to use ::Collect::field().
   * checks/po-debconf{,.desc}:
     + [ADB] Check that at least one complete translation exists.  Thanks Jordà
       Polo.

-- 
Debian package checker


Reply to: