support singular tag/usertag in psuedoheaders

Thanks to James Clarke for the suggested patch

diff --git a/debian/changelog b/debian/changelog
index eae7eb18e40edaae19264a573c166acee809f14a..bd2a65060444e27c4df3a517d3c013b6c059b376 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -50,6 +50,8 @@ debbugs (2.6.0~exp1) UNRELEASED; urgency=low
     been doing from the beginning anyway). (Closes: #856991)
   * Reply sent messages (-forwarded and -done) are not informational messages.
     (Closes: #864725)
+  * Pluralize singular tag and usertag in pseudoheaders (Closes: #861234).
+    Thanks to James Clarke
 
   [ Niels Thykier ]
   * quitcgi() now returns 400/500 status codes instead of 200 (Closes: #584922)

diff --git a/scripts/process b/scripts/process
index 089fa46888be91a6234ddaa0cbb80f8d18f5498d..2e0e0030909a380e7b578dadb54d943b8fd0f112 100755 (executable)
--- a/scripts/process
+++ b/scripts/process
@@ -228,6 +228,8 @@ for my $phline (@bodylines)
     last if $phline !~ m/^([\w-]+):\s*(\S.*)/;
     my ($fn, $fv) = ($1, $2);
     $fv =~ s/\s*$//;
+    # pluralize tag/usertag
+    $fn = $fn.'s' if $fn =~ /^(?:tag|usertag)$/;
     print {$debugfh} ">$fn|$fv|\n";
     $fn = lc $fn;
     if ($fn =~ /^control$/) {