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

[SCM] Debian package checker branch, master, updated. 2.2.13-37-gf43261a



The following commit has been merged in the master branch:
commit f43261a2ef4004eaa226be46ad3c626ed2825a62
Author: Colin Watson <cjwatson@debian.org>
Date:   Sat Aug 15 22:23:23 2009 +0100

    Don't emit not-using-po-debconf for internal-only templates
    
    * checks/po-debconf:
      + [CW] Don't emit not-using-po-debconf if all templates are marked "for
        internal use".  (Closes: #492626)

diff --git a/checks/po-debconf b/checks/po-debconf
index 5a01600..67b32bc 100644
--- a/checks/po-debconf
+++ b/checks/po-debconf
@@ -45,6 +45,7 @@ for my $file (readdir(DEB)) {
 		} else {
 			open(PO, '<', "debfiles/$file")
 				or fail("Can't open debfiles/$file file.");
+			my $in_template = 0;
 			while (<PO>) {
 				tag "translated-default-field", "$file: $."
 					if (m/^_Default(Choice)?: [^\[]*$/);
@@ -52,7 +53,13 @@ for my $file (readdir(DEB)) {
 					my $template = $1;
 					next if $template =~ m,^shared/packages-(wordlist|ispell)$,;
 					next if $template =~ m,/languages$,;
+					$in_template = 1;
+				} elsif ($in_template and /^_?Description: (.+)/i) {
+					my $description = $1;
+					next if $description =~ /for internal use/;
 					$has_template = 1;
+				} elsif ($in_template and /^$/) {
+					$in_template = 0;
 				}
 			}
 			close PO;
diff --git a/debian/changelog b/debian/changelog
index 4104436..e6b68c9 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -40,6 +40,9 @@ lintian (2.2.14) UNRELEASED; urgency=low
   * checks/patch-systems{,.desc}:
     + [RA] Check for a patch system in use but no debian/README.source.
       Based on a patch from Jonathan Yu.  (Closes: #537969)
+  * checks/po-debconf:
+    + [CW] Don't emit not-using-po-debconf if all templates are marked "for
+      internal use".  (Closes: #492626)
   * checks/scripts:
     + [RA] Fix parsing of dpkg-divert commands diverting a file ending in
       a number, followed by a redirection.  Thanks, Andreas Beckmann.

-- 
Debian package checker


Reply to: