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

lintian: r750 - in trunk: checks debian testset testset/debconf/debian/po



Author: rra
Date: 2006-09-24 06:23:11 +0200 (Sun, 24 Sep 2006)
New Revision: 750

Added:
   trunk/testset/debconf/debian/po/sample-file.po
Modified:
   trunk/checks/po-debconf
   trunk/debian/changelog
   trunk/testset/tags.debconf
Log:
* checks/po-debconf:
  + [RA] Avoid Perl warnings on .po files that don't contain msgstr
    lines.  Patch from Thomas Huriaux.  (Closes: #387357)

Modified: trunk/checks/po-debconf
===================================================================
--- trunk/checks/po-debconf	2006-09-24 03:58:45 UTC (rev 749)
+++ trunk/checks/po-debconf	2006-09-24 04:23:11 UTC (rev 750)
@@ -123,6 +123,10 @@
                 last if m/^msgstr/m;
         }
         close(PO);
+	unless ($_) {
+		tag "invalid-po-file", "debian/po/$file";
+		next;
+	}
         s/"\n"//g;
         my $charset = '';
         if (m/charset=(.*?)\\n/) {

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-09-24 03:58:45 UTC (rev 749)
+++ trunk/debian/changelog	2006-09-24 04:23:11 UTC (rev 750)
@@ -13,6 +13,9 @@
   * checks/init.d:
     + [RA] Correctly handle LSB keywords which are present but have an
       empty value.  Reported by Erich Schubert.  (Closes: #386968)
+  * checks/po-debconf:
+    + [RA] Avoid Perl warnings on .po files that don't contain msgstr
+      lines.  Patch from Thomas Huriaux.  (Closes: #387357)
   * checks/scripts:
     + [RA] Add /usr/bin/gosh from the gauche package to the list of valid
       interpreters.  Thanks, Tatsuya Kinoshita.  (Closes: #386798)
@@ -27,7 +30,7 @@
       inverse implication to catch many more cases.  (The latter code
       isn't currently used in lintian.)
 
- -- Russ Allbery <rra@debian.org>  Sat, 23 Sep 2006 20:57:02 -0700
+ -- Russ Allbery <rra@debian.org>  Sat, 23 Sep 2006 21:19:28 -0700
 
 lintian (1.23.24) unstable; urgency=low
 

Added: trunk/testset/debconf/debian/po/sample-file.po
===================================================================
--- trunk/testset/debconf/debian/po/sample-file.po	2006-09-24 03:58:45 UTC (rev 749)
+++ trunk/testset/debconf/debian/po/sample-file.po	2006-09-24 04:23:11 UTC (rev 750)
@@ -0,0 +1 @@
+This is some file that isn't actually a valid .po file.

Modified: trunk/testset/tags.debconf
===================================================================
--- trunk/testset/tags.debconf	2006-09-24 03:58:45 UTC (rev 749)
+++ trunk/testset/tags.debconf	2006-09-24 04:23:11 UTC (rev 750)
@@ -9,6 +9,7 @@
 E: debconf-test: unknown-debconf-priority config:12 normal
 E: debconf-udeb udeb: udeb-postinst-must-not-call-ldconfig
 W: debconf source: invalid-po-file debian/po/fr.po
+W: debconf source: invalid-po-file debian/po/sample-file.po
 W: debconf source: maintainer-script-lacks-debhelper-token debian/debconf-test.postinst
 W: debconf source: newer-debconf-templates
 W: debconf source: stray-translated-debconf-templates debconf-test.templates.de



Reply to: