fix failure to import locking funcs and don't save empty spamlogs

[debbugs.git] / scripts / process

diff --git a/scripts/process b/scripts/process
index 716e0a5370e72e7282a6c386444f922ef2a29d60..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$/) {
@@ -1262,7 +1264,7 @@ sub fill_template{
                     };
      my $hole_var = {'&bugurl' =>
                     sub{"$_[0]: ".
-                             'http://'.$config{cgi_domain}.'/'.
+                             $config{cgi_domain}.'/'.
                                   Debbugs::CGI::bug_links(bug=>$_[0],
                                                           links_only => 1,
                                                          );