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

lintian: r1086 - in trunk: checks debian frontend testset



Author: rra
Date: 2008-01-03 02:51:15 +0100 (Thu, 03 Jan 2008)
New Revision: 1086

Modified:
   trunk/checks/files.desc
   trunk/debian/changelog
   trunk/frontend/lintian
   trunk/testset/runtests
Log:
* debian/files.desc:
  + [RA] Remove a stray variable from the config-file-reserved tag.
* frontend/lintian:
  + [RA] Allow + and . in tag names in overrides.  Thanks, Stefan
    Fritsch.  (Closes: #454790)
* testset/runtests:
  + [RA] Test tags for valid characters.

Modified: trunk/checks/files.desc
===================================================================
--- trunk/checks/files.desc	2008-01-03 01:37:35 UTC (rev 1085)
+++ trunk/checks/files.desc	2008-01-03 01:51:15 UTC (rev 1086)
@@ -77,7 +77,7 @@
  paths.
 Ref: policy 11.8.7
 
-Tag: config-file-reserved $file
+Tag: config-file-reserved
 Type: error
 Info: This file is reserved by a specific package.  Please email the
  maintainer of the package in question if you have questions.

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-01-03 01:37:35 UTC (rev 1085)
+++ trunk/debian/changelog	2008-01-03 01:51:15 UTC (rev 1086)
@@ -7,12 +7,18 @@
       particular about the exact formatting of the dh-make template.
       Triggering off the template text is enough and matches linda.
       Thanks, Joerg Jaspert.  (Closes: #458074)
+  * debian/files.desc:
+    + [RA] Remove a stray variable from the config-file-reserved tag.
 
   * debian/control:
     + [RA] Suggest libtext-template-perl, needed for HTML reporting.
   * debian/copyright:
     + [RA] Add my copyright statement.
     + [RA] Reference GPL-2, not the GPL symlink, reflecting our license.
+
+  * frontend/lintian:
+    + [RA] Allow + and . in tag names in overrides.  Thanks, Stefan
+      Fritsch.  (Closes: #454790)
   
   * lib/Dep.pm:
     + [RA] Allow substvars instead of package names so that dependency
@@ -34,6 +40,9 @@
   * reporting/templates/*:
     + [RA] New Text::Template page templates for the HTML reports.
 
+  * testset/runtests:
+    + [RA] Test tags for valid characters.
+
  -- Russ Allbery <rra@debian.org>  Wed, 02 Jan 2008 16:01:02 -0800
 
 lintian (1.23.41) unstable; urgency=low

Modified: trunk/frontend/lintian
===================================================================
--- trunk/frontend/lintian	2008-01-03 01:37:35 UTC (rev 1085)
+++ trunk/frontend/lintian	2008-01-03 01:51:15 UTC (rev 1086)
@@ -1290,7 +1290,7 @@
                     s/\s+/ /go;
                     my $override = $_;
                     $override =~ s/^\Q$pkg\E( \Q$long_type\E)?: //;
-                    if ($override eq '' or $override !~ /^[\w0-9-]+(\s+.*)?$/) {
+                    if ($override eq '' or $override !~ /^[\w0-9.+-]+(\s+.*)?$/) {
                         tag ('malformed-override', $_);
                     } else {
                         Tags::add_override($override);

Modified: trunk/testset/runtests
===================================================================
--- trunk/testset/runtests	2008-01-03 01:37:35 UTC (rev 1085)
+++ trunk/testset/runtests	2008-01-03 01:51:15 UTC (rev 1086)
@@ -134,6 +134,10 @@
     for my $i (read_dpkg_control($desc_file)) {
 	$desc_file =~ s#.*/##;
 	if (exists $i->{'tag'}) {
+	    if ($i->{'tag'} !~ /^[\w0-9.+-]+$/) {
+		print "E: test-tag-has-invalid-characters $i->{'tag'}"
+		    . " in $desc_file\n";
+	    }
 	    if (not exists $i->{'info'}) {
 		print "E: test-has-no-info $i->{'tag'} in $desc_file\n";
 		$testok = 0;
@@ -321,4 +325,8 @@
     return $errcode == 0;
 }
 
+# Local Variables:
+# indent-tabs-mode: t
+# cperl-indent-level: 4
+# End:
 # vim: ts=8 sw=4


Reply to: