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

[SCM] Debian package checker branch, master, updated. 2.2.14-15-gac94628



The following commit has been merged in the master branch:
commit ac946285f6d48b213c59098cdf552e6332c7e2dd
Author: Raphael Geissert <atomo64@gmail.com>
Date:   Sun Aug 30 21:23:53 2009 -0500

    Return 1 when ignoring duplicate packages to be checked
    
    Fixes a spurious error message saying that the file is empty.
    Thanks to Jakub Wilk <ubanus@users.sf.net> for the report.

diff --git a/debian/changelog b/debian/changelog
index da80604..b99c055 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -46,6 +46,11 @@ lintian (2.2.15) UNRELEASED; urgency=low
   * data/files/fonts:
     + [RA] Refresh and include Type 1 fonts and packages as well.
 
+  * lib/Lintian/Schedule.pm:
+    + [RA] If declining to add a duplicate file to the Lintian check
+      schedule, return success to avoid a spurious error message.  Patch
+      from Raphael Geissert.  (Closes: #542072)
+
   * private/refresh-fonts-data:
     + [RA] To match what checks/files looks for, also look for *.pfb files
       and packages starting with t1-.
diff --git a/lib/Lintian/Schedule.pm b/lib/Lintian/Schedule.pm
index bb71839..c117910 100644
--- a/lib/Lintian/Schedule.pm
+++ b/lib/Lintian/Schedule.pm
@@ -62,7 +62,7 @@ sub add_file {
 	    printf "N: Ignoring duplicate %s package $pkg (version $ver)\n",
 		$type eq 'b' ? 'binary' : ($type eq 's' ? 'source': 'udeb');
 	}
-	return;
+	return 1;
     }
 
     push(@{$self->{schedule}}, \%h);

-- 
Debian package checker


Reply to: