lintian: r963 - in trunk: checks debian testset

[rra@debian.org]

Author: rra
Date: 2007-10-15 04:03:07 +0200 (Mon, 15 Oct 2007)
New Revision: 963

Modified:
   trunk/checks/debconf
   trunk/debian/changelog
   trunk/testset/tags.debconf
Log:
  + [RA] More exactly follow the Developer's Reference recommendations
    by only requiring open prompts for string and password prompts and
    only complaining about imperative wording for select and multiselect
    templates.  Thanks, Steve Langasek.  (Closes: #442711)

Modified: trunk/checks/debconf
===================================================================
--- trunk/checks/debconf	2007-10-15 01:56:44 UTC (rev 962)
+++ trunk/checks/debconf	2007-10-15 02:03:07 UTC (rev 963)
@@ -281,11 +281,14 @@
     }
     my $type = $template->{type} || '';
     unless ($short =~ /for internal use/i) {
-	my $isprompt = grep { $_ eq $type } qw(string select password multiselect);
+	my $isprompt = grep { $_ eq $type } qw(string password);
+        my $isselect = grep { $_ eq $type } qw(select multiselect);
 	if ($isprompt) {
 	    if ($short && ($short !~ m/:$/ || $short =~ m/^(what|who|when|where|which|how)/i)) {
 		tag "malformed-prompt-in-templates", $template->{template};
 	    }
+        }
+        if ($isselect) {
 	    if ($short =~ /^(Please|Cho+se|Enter|Select|Specify|Give)/) {
 		tag "using-imperative-form-in-templates", $template->{template};
 	    }

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2007-10-15 01:56:44 UTC (rev 962)
+++ trunk/debian/changelog	2007-10-15 02:03:07 UTC (rev 963)
@@ -21,6 +21,10 @@
       warn on any questions in the extended description, allow yes/no
       mentions in non-boolean templates, and catch more first-person
       language.  (Closes: #439508)
+    + [RA] More exactly follow the Developer's Reference recommendations
+      by only requiring open prompts for string and password prompts and
+      only complaining about imperative wording for select and multiselect
+      templates.  Thanks, Steve Langasek.  (Closes: #442711)
   * checks/description{.desc,}:
     + [RA] Warn (at info level for now) about Homepage pseudo-fields in
       the extended description.  (Closes: #444336)
@@ -43,7 +47,7 @@
   * collection/changelog-file{.desc,}:
     + [RA] Collect NEWS.Debian as well as changelog.
 
- -- Russ Allbery <rra@debian.org>  Sun, 14 Oct 2007 18:53:49 -0700
+ -- Russ Allbery <rra@debian.org>  Sun, 14 Oct 2007 19:00:30 -0700
 
 lintian (1.23.34) unstable; urgency=low
 

Modified: trunk/testset/tags.debconf
===================================================================
--- trunk/testset/tags.debconf	2007-10-15 01:56:44 UTC (rev 962)
+++ trunk/testset/tags.debconf	2007-10-15 02:03:07 UTC (rev 963)
@@ -25,7 +25,6 @@
 W: debconf-test-preinst: missing-debconf-dependency-for-preinst
 W: debconf-test-preinst: old-fsf-address-in-copyright-file
 W: debconf-test: making-assumptions-about-interfaces-in-templates debconf/testboolean
-W: debconf-test: malformed-prompt-in-templates debconf/testmulti
 W: debconf-test: malformed-prompt-in-templates debconf/teststring
 W: debconf-test: malformed-question-in-templates debconf/testboolean
 W: debconf-test: malformed-title-in-templates debconf/testnote