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

lintian: r1227 - in trunk: checks debian testset/debconf/debian



Author: rra
Date: 2008-02-22 18:15:33 +0100 (Fri, 22 Feb 2008)
New Revision: 1227

Modified:
   trunk/checks/changelog-file
   trunk/debian/changelog
   trunk/testset/debconf/debian/changelog
Log:
* checks/changelog-file:
  + [RA] Adjust for the extra space added by Parse::DebianChangelog when
    checking line length.  Thanks, Robert Millan.  (Closes: #467019)

Modified: trunk/checks/changelog-file
===================================================================
--- trunk/checks/changelog-file	2008-02-21 02:47:58 UTC (rev 1226)
+++ trunk/checks/changelog-file	2008-02-22 17:15:33 UTC (rev 1227)
@@ -333,9 +333,12 @@
     # check.  For some reason, use open ':utf8' isn't sufficient.  If the
     # changelog uses a non-UTF-8 encoding, this will mangle it, but it doesn't
     # matter for the length check.
-    my @lines = split ('\n', decode ('utf-8', $changes));
+    #
+    # Parse::DebianChangelog adds an additional space to the beginning of each
+    # line, so we have to adjust for that in the length check.
+    my @lines = split ("\n", decode ('utf-8', $changes));
     for my $i (0 .. $#lines) {
-        if (length ($lines[$i]) > 80 && $lines[$i] !~ /^[\s.o*+-]*\S+$/) {
+        if (length ($lines[$i]) > 81 && $lines[$i] !~ /^[\s.o*+-]*\S+$/) {
             tag 'debian-changelog-line-too-long', "line " . ($i + 1);
         }
     }

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-02-21 02:47:58 UTC (rev 1226)
+++ trunk/debian/changelog	2008-02-22 17:15:33 UTC (rev 1227)
@@ -4,6 +4,9 @@
     + [RA] Anchor file matches for Perl libraries and debugging symbols so
       as to not match partial paths.  Based on a patch from Niko Tyni.
       (Closes: #466501)
+  * checks/changelog-file:
+    + [RA] Adjust for the extra space added by Parse::DebianChangelog when
+      checking line length.  Thanks, Robert Millan.  (Closes: #467019)
   * checks/control-files{.desc,}:
     + [FL] Warn about empty control files. I can't see any use for
       them. Exclude udebs though, since they might differ there.

Modified: trunk/testset/debconf/debian/changelog
===================================================================
--- trunk/testset/debconf/debian/changelog	2008-02-21 02:47:58 UTC (rev 1226)
+++ trunk/testset/debconf/debian/changelog	2008-02-22 17:15:33 UTC (rev 1227)
@@ -1,5 +1,6 @@
 debconf (1~rc1) unstable; urgency=low
 
   * Initial Release
+  * Changelog line with exactly 80 characters which tests the line-too-long tag.
 
  -- Lintian Maintainers <lintian@packages.debian.org>  Sat, 13 Nov 2004 22:45:05 +0100


Reply to: